projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'davem-next' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[firefly-linux-kernel-4.4.55.git]
/
sound
/
isa
/
adlib.c
diff --git
a/sound/isa/adlib.c
b/sound/isa/adlib.c
index efa8c80d05b69eecc9b03795e609b60b497bd77a..374b7177e111d2f806930d84cdb147c1ace28356 100644
(file)
--- a/
sound/isa/adlib.c
+++ b/
sound/isa/adlib.c
@@
-36,7
+36,7
@@
static int __devinit snd_adlib_match(struct device *dev, unsigned int n)
return 0;
if (port[n] == SNDRV_AUTO_PORT) {
return 0;
if (port[n] == SNDRV_AUTO_PORT) {
-
snd_printk(KERN_ERR "%s: please specify port\n", dev->bus_id
);
+
dev_err(dev, "please specify port\n"
);
return 0;
}
return 1;
return 0;
}
return 1;
@@
-55,13
+55,13
@@
static int __devinit snd_adlib_probe(struct device *dev, unsigned int n)
card = snd_card_new(index[n], id[n], THIS_MODULE, 0);
if (!card) {
card = snd_card_new(index[n], id[n], THIS_MODULE, 0);
if (!card) {
-
snd_printk(KERN_ERR "%s: could not create card\n", dev->bus_id
);
+
dev_err(dev, "could not create card\n"
);
return -EINVAL;
}
card->private_data = request_region(port[n], 4, CRD_NAME);
if (!card->private_data) {
return -EINVAL;
}
card->private_data = request_region(port[n], 4, CRD_NAME);
if (!card->private_data) {
-
snd_printk(KERN_ERR "%s: could not grab ports\n", dev->bus_id
);
+
dev_err(dev, "could not grab ports\n"
);
error = -EBUSY;
goto out;
}
error = -EBUSY;
goto out;
}
@@
-73,13
+73,13
@@
static int __devinit snd_adlib_probe(struct device *dev, unsigned int n)
error = snd_opl3_create(card, port[n], port[n] + 2, OPL3_HW_AUTO, 1, &opl3);
if (error < 0) {
error = snd_opl3_create(card, port[n], port[n] + 2, OPL3_HW_AUTO, 1, &opl3);
if (error < 0) {
-
snd_printk(KERN_ERR "%s: could not create OPL\n", dev->bus_id
);
+
dev_err(dev, "could not create OPL\n"
);
goto out;
}
error = snd_opl3_hwdep_new(opl3, 0, 0, NULL);
if (error < 0) {
goto out;
}
error = snd_opl3_hwdep_new(opl3, 0, 0, NULL);
if (error < 0) {
-
snd_printk(KERN_ERR "%s: could not create FM\n", dev->bus_id
);
+
dev_err(dev, "could not create FM\n"
);
goto out;
}
goto out;
}
@@
-87,7
+87,7
@@
static int __devinit snd_adlib_probe(struct device *dev, unsigned int n)
error = snd_card_register(card);
if (error < 0) {
error = snd_card_register(card);
if (error < 0) {
-
snd_printk(KERN_ERR "%s: could not register card\n", dev->bus_id
);
+
dev_err(dev, "could not register card\n"
);
goto out;
}
goto out;
}