staging: rtl8192e: Remove RTLLIB_ERROR() and RTLLIB_WARNING()

Use pr_* where needed (rtllib init code).

Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h
index 411363c5eb9ae717b5a7fa107940a659e250c68d..42c37f83d96811b3d3591916f1a7f3a70f0277d1 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib.h
+++ b/drivers/staging/rtl8192e/rtllib.h
@@ -701,8 +701,6 @@ do {                                                                \
 #define RTLLIB_DL_TRACE           (1<<29)
 #define RTLLIB_DL_DATA    (1<<30)
 #define RTLLIB_DL_ERR     (1<<31)
-#define RTLLIB_ERROR(f, a...) pr_err("rtllib: " f, ## a)
-#define RTLLIB_WARNING(f, a...) pr_warn("rtllib: " f, ## a)
 #define RTLLIB_DEBUG_INFO(f, a...)   RTLLIB_DEBUG(RTLLIB_DL_INFO, f, ## a)
 
 #define RTLLIB_DEBUG_WX(f, a...)     RTLLIB_DEBUG(RTLLIB_DL_WX, f, ## a)

diff --git a/drivers/staging/rtl8192e/rtllib_module.c b/drivers/staging/rtl8192e/rtllib_module.c
index 32cc8df9d3a76a9efae7fac3491082fbf4c83e3d..b8c7df501db7ab3bb99e957967ac27597c97f55b 100644 (file)
--- a/drivers/staging/rtl8192e/rtllib_module.c
+++ b/drivers/staging/rtl8192e/rtllib_module.c
@@ -107,7 +107,7 @@ struct net_device *alloc_rtllib(int sizeof_priv)
 
        dev = alloc_etherdev(sizeof(struct rtllib_device) + sizeof_priv);
        if (!dev) {
-               RTLLIB_ERROR("Unable to network device.\n");
+               pr_err("Unable to allocate net_device.\n");
                return NULL;
        }
        ieee = (struct rtllib_device *)netdev_priv_rsl(dev);
@@ -116,8 +116,7 @@ struct net_device *alloc_rtllib(int sizeof_priv)
 
        err = rtllib_networks_allocate(ieee);
        if (err) {
-               RTLLIB_ERROR("Unable to allocate beacon storage: %d\n",
-                               err);
+               pr_err("Unable to allocate beacon storage: %d\n", err);
                goto failed;
        }
        rtllib_networks_initialize(ieee);
@@ -240,8 +239,7 @@ static int __init rtllib_init(void)
        rtllib_debug_level = debug;
        rtllib_proc = proc_mkdir(DRV_NAME, init_net.proc_net);
        if (rtllib_proc == NULL) {
-               RTLLIB_ERROR("Unable to create " DRV_NAME
-                               " proc directory\n");
+               pr_err("Unable to create " DRV_NAME " proc directory\n");
                return -EIO;
        }
        e = proc_create("debug_level", S_IRUGO | S_IWUSR, rtllib_proc, &fops);