From f1f6b8f65ff08afed4532b88de1a3bbea773787f Mon Sep 17 00:00:00 2001 From: Daniel Mack Date: Sun, 3 Mar 2013 20:46:22 +0100 Subject: ALSA: snd-usb-caiaq: switch to dev_*() logging Get rid of the proprietary functions log() and debug() and use the generic dev_*() approach. A macro is needed to cast a cdev to a struct device *. Signed-off-by: Daniel Mack Signed-off-by: Takashi Iwai --- sound/usb/caiaq/device.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'sound/usb/caiaq/device.h') diff --git a/sound/usb/caiaq/device.h b/sound/usb/caiaq/device.h index 7176a0ec950b..ad102fac6942 100644 --- a/sound/usb/caiaq/device.h +++ b/sound/usb/caiaq/device.h @@ -25,16 +25,7 @@ #define CAIAQ_USB_STR_LEN 0xff #define MAX_STREAMS 32 -//#define SND_USB_CAIAQ_DEBUG - #define MODNAME "snd-usb-caiaq" -#define log(x...) snd_printk(KERN_WARNING MODNAME" log: " x) - -#ifdef SND_USB_CAIAQ_DEBUG -#define debug(x...) snd_printk(KERN_WARNING MODNAME " debug: " x) -#else -#define debug(x...) do { } while(0) -#endif #define EP1_CMD_GET_DEVICE_INFO 0x1 #define EP1_CMD_READ_ERP 0x2 @@ -129,6 +120,7 @@ struct snd_usb_caiaq_cb_info { }; #define caiaqdev(c) ((struct snd_usb_caiaqdev*)(c)->private_data) +#define caiaqdev_to_dev(d) (d->chip.card->dev) int snd_usb_caiaq_set_audio_params (struct snd_usb_caiaqdev *cdev, int rate, int depth, int bbp); int snd_usb_caiaq_set_auto_msg (struct snd_usb_caiaqdev *cdev, int digital, int analog, int erp); -- cgit v1.2.1