diff options
Diffstat (limited to 'sound/i2c/other/pt2258.c')
| -rw-r--r-- | sound/i2c/other/pt2258.c | 30 |
1 files changed, 8 insertions, 22 deletions
diff --git a/sound/i2c/other/pt2258.c b/sound/i2c/other/pt2258.c index 9fa390ba1718..0fbac827124b 100644 --- a/sound/i2c/other/pt2258.c +++ b/sound/i2c/other/pt2258.c @@ -1,22 +1,8 @@ +// SPDX-License-Identifier: GPL-2.0-or-later /* * ALSA Driver for the PT2258 volume controller. * * Copyright (c) 2006 Jochen Voss <voss@seehuhn.de> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * */ #include <sound/core.h> @@ -77,7 +63,7 @@ int snd_pt2258_reset(struct snd_pt2258 *pt) __error: snd_i2c_unlock(pt->i2c_bus); - snd_printk(KERN_ERR "PT2258 reset failed\n"); + dev_err(pt->card->dev, "PT2258 reset failed\n"); return -EIO; } @@ -94,7 +80,7 @@ static int pt2258_stereo_volume_info(struct snd_kcontrol *kcontrol, static int pt2258_stereo_volume_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_pt2258 *pt = kcontrol->private_data; + struct snd_pt2258 *pt = snd_kcontrol_chip(kcontrol); int base = kcontrol->private_value; /* chip does not support register reads */ @@ -106,7 +92,7 @@ static int pt2258_stereo_volume_get(struct snd_kcontrol *kcontrol, static int pt2258_stereo_volume_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_pt2258 *pt = kcontrol->private_data; + struct snd_pt2258 *pt = snd_kcontrol_chip(kcontrol); int base = kcontrol->private_value; unsigned char bytes[2]; int val0, val1; @@ -138,7 +124,7 @@ static int pt2258_stereo_volume_put(struct snd_kcontrol *kcontrol, __error: snd_i2c_unlock(pt->i2c_bus); - snd_printk(KERN_ERR "PT2258 access failed\n"); + dev_err(pt->card->dev, "PT2258 access failed\n"); return -EIO; } @@ -147,7 +133,7 @@ static int pt2258_stereo_volume_put(struct snd_kcontrol *kcontrol, static int pt2258_switch_get(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_pt2258 *pt = kcontrol->private_data; + struct snd_pt2258 *pt = snd_kcontrol_chip(kcontrol); ucontrol->value.integer.value[0] = !pt->mute; return 0; @@ -156,7 +142,7 @@ static int pt2258_switch_get(struct snd_kcontrol *kcontrol, static int pt2258_switch_put(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol) { - struct snd_pt2258 *pt = kcontrol->private_data; + struct snd_pt2258 *pt = snd_kcontrol_chip(kcontrol); unsigned char bytes[2]; int val; @@ -175,7 +161,7 @@ static int pt2258_switch_put(struct snd_kcontrol *kcontrol, __error: snd_i2c_unlock(pt->i2c_bus); - snd_printk(KERN_ERR "PT2258 access failed 2\n"); + dev_err(pt->card->dev, "PT2258 access failed 2\n"); return -EIO; } |