|
@@ -711,8 +711,7 @@ static int snd_emu1010_load_firmware(struct snd_emu10k1 *emu, const char *filena
|
|
|
static int emu1010_firmware_thread(void *data)
|
|
|
{
|
|
|
struct snd_emu10k1 *emu = data;
|
|
|
- int tmp, tmp2;
|
|
|
- int reg;
|
|
|
+ u32 tmp, tmp2, reg;
|
|
|
int err;
|
|
|
|
|
|
for (;;) {
|
|
@@ -758,7 +757,7 @@ static int emu1010_firmware_thread(void *data)
|
|
|
snd_printk(KERN_INFO "emu1010: Audio Dock Firmware loaded\n");
|
|
|
snd_emu1010_fpga_read(emu, EMU_DOCK_MAJOR_REV, &tmp);
|
|
|
snd_emu1010_fpga_read(emu, EMU_DOCK_MINOR_REV, &tmp2);
|
|
|
- snd_printk(KERN_INFO "Audio Dock ver:%d.%d\n",
|
|
|
+ snd_printk(KERN_INFO "Audio Dock ver: %u.%u\n",
|
|
|
tmp, tmp2);
|
|
|
/* Sync clocking between 1010 and Dock */
|
|
|
/* Allow DLL to settle */
|
|
@@ -805,8 +804,7 @@ static int emu1010_firmware_thread(void *data)
|
|
|
static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)
|
|
|
{
|
|
|
unsigned int i;
|
|
|
- int tmp, tmp2;
|
|
|
- int reg;
|
|
|
+ u32 tmp, tmp2, reg;
|
|
|
int err;
|
|
|
const char *filename = NULL;
|
|
|
|
|
@@ -888,7 +886,7 @@ static int snd_emu10k1_emu1010_init(struct snd_emu10k1 *emu)
|
|
|
snd_printk(KERN_INFO "emu1010: Hana Firmware loaded\n");
|
|
|
snd_emu1010_fpga_read(emu, EMU_HANA_MAJOR_REV, &tmp);
|
|
|
snd_emu1010_fpga_read(emu, EMU_HANA_MINOR_REV, &tmp2);
|
|
|
- snd_printk(KERN_INFO "emu1010: Hana version: %d.%d\n", tmp, tmp2);
|
|
|
+ snd_printk(KERN_INFO "emu1010: Hana version: %u.%u\n", tmp, tmp2);
|
|
|
/* Enable 48Volt power to Audio Dock */
|
|
|
snd_emu1010_fpga_write(emu, EMU_HANA_DOCK_PWR, EMU_HANA_DOCK_PWR_ON);
|
|
|
|