summaryrefslogtreecommitdiff
path: root/drivers/ssb/bridge_pcmcia_80211.c
diff options
context:
space:
mode:
authorMichael Büsch <m@bues.ch>2018-07-31 22:56:38 +0300
committerKalle Valo <kvalo@codeaurora.org>2018-08-09 18:45:50 +0300
commitb8b6069cf2087545fe53ec920e8353133e9a70bf (patch)
treef4a9eea68710798c1d8794c4d0c85c7defea25b5 /drivers/ssb/bridge_pcmcia_80211.c
parent4d77a89e3924b12f4a5628b21237e57ab4703866 (diff)
downloadlinux-b8b6069cf2087545fe53ec920e8353133e9a70bf.tar.xz
ssb: Remove home-grown printk wrappers
Replace the ssb printk wrappers by standard print helpers. Also remove SSB_SILENT. Nobody should use it anyway. Originally submitted by Joe Perches <joe@perches.com>. Modified to add dev_... based printks. Signed-off-by: Michael Buesch <m@bues.ch> Tested-by: Michael Buesch <m@bues.ch> Cc: Joe Perches <joe@perches.com> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Diffstat (limited to 'drivers/ssb/bridge_pcmcia_80211.c')
-rw-r--r--drivers/ssb/bridge_pcmcia_80211.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ssb/bridge_pcmcia_80211.c b/drivers/ssb/bridge_pcmcia_80211.c
index d70568ea02d5..f51f150307df 100644
--- a/drivers/ssb/bridge_pcmcia_80211.c
+++ b/drivers/ssb/bridge_pcmcia_80211.c
@@ -6,6 +6,8 @@
* Licensed under the GNU/GPL. See COPYING for details.
*/
+#include "ssb_private.h"
+
#include <linux/ssb/ssb.h>
#include <linux/slab.h>
#include <linux/module.h>
@@ -15,8 +17,6 @@
#include <pcmcia/ds.h>
#include <pcmcia/cisreg.h>
-#include "ssb_private.h"
-
static const struct pcmcia_device_id ssb_host_pcmcia_tbl[] = {
PCMCIA_DEVICE_MANF_CARD(0x2D0, 0x448),
PCMCIA_DEVICE_MANF_CARD(0x2D0, 0x476),
@@ -70,7 +70,7 @@ err_disable:
err_kfree_ssb:
kfree(ssb);
out_error:
- ssb_err("Initialization failed (%d, %d)\n", res, err);
+ dev_err(&dev->dev, "Initialization failed (%d, %d)\n", res, err);
return err;
}