diff options
Diffstat (limited to 'drivers/staging/cxt1e1/linux.c')
-rw-r--r-- | drivers/staging/cxt1e1/linux.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/cxt1e1/linux.c b/drivers/staging/cxt1e1/linux.c index c7930287e3d..0f78f896275 100644 --- a/drivers/staging/cxt1e1/linux.c +++ b/drivers/staging/cxt1e1/linux.c | |||
@@ -108,9 +108,9 @@ extern int unregister_hdlc_device_v7 (hdlc_device *); | |||
108 | #endif | 108 | #endif |
109 | 109 | ||
110 | int error_flag; /* module load error reporting */ | 110 | int error_flag; /* module load error reporting */ |
111 | int log_level = LOG_ERROR; | 111 | int cxt1e1_log_level = LOG_ERROR; |
112 | int log_level_default = LOG_ERROR; | 112 | int log_level_default = LOG_ERROR; |
113 | module_param(log_level, int, 0444); | 113 | module_param(cxt1e1_log_level, int, 0444); |
114 | 114 | ||
115 | int cxt1e1_max_mru = MUSYCC_MRU; | 115 | int cxt1e1_max_mru = MUSYCC_MRU; |
116 | int max_mru_default = MUSYCC_MRU; | 116 | int max_mru_default = MUSYCC_MRU; |
@@ -497,7 +497,7 @@ create_chan (struct net_device * ndev, ci_t * ci, | |||
497 | rtnl_lock (); /* needed due to Ioctl calling sequence */ | 497 | rtnl_lock (); /* needed due to Ioctl calling sequence */ |
498 | if (ret) | 498 | if (ret) |
499 | { | 499 | { |
500 | if (log_level >= LOG_WARN) | 500 | if (cxt1e1_log_level >= LOG_WARN) |
501 | pr_info("%s: create_chan[%d] registration error = %d.\n", | 501 | pr_info("%s: create_chan[%d] registration error = %d.\n", |
502 | ci->devname, cp->channum, ret); | 502 | ci->devname, cp->channum, ret); |
503 | free_netdev (dev); /* cleanup */ | 503 | free_netdev (dev); /* cleanup */ |
@@ -722,11 +722,11 @@ do_get_chan_stats (struct net_device * ndev, void *data) | |||
722 | STATIC status_t | 722 | STATIC status_t |
723 | do_set_loglevel (struct net_device * ndev, void *data) | 723 | do_set_loglevel (struct net_device * ndev, void *data) |
724 | { | 724 | { |
725 | unsigned int log_level; | 725 | unsigned int cxt1e1_log_level; |
726 | 726 | ||
727 | if (copy_from_user (&log_level, data, sizeof (int))) | 727 | if (copy_from_user (&cxt1e1_log_level, data, sizeof (int))) |
728 | return -EFAULT; | 728 | return -EFAULT; |
729 | sbecom_set_loglevel (log_level); | 729 | sbecom_set_loglevel (cxt1e1_log_level); |
730 | return 0; | 730 | return 0; |
731 | } | 731 | } |
732 | 732 | ||
@@ -1115,9 +1115,9 @@ c4_mod_init (void) | |||
1115 | return -rtn; /* installation failure - see system log */ | 1115 | return -rtn; /* installation failure - see system log */ |
1116 | 1116 | ||
1117 | /* housekeeping notifications */ | 1117 | /* housekeeping notifications */ |
1118 | if (log_level != log_level_default) | 1118 | if (cxt1e1_log_level != log_level_default) |
1119 | pr_info("NOTE: driver parameter <log_level> changed from default %d to %d.\n", | 1119 | pr_info("NOTE: driver parameter <cxt1e1_log_level> changed from default %d to %d.\n", |
1120 | log_level_default, log_level); | 1120 | log_level_default, cxt1e1_log_level); |
1121 | if (cxt1e1_max_mru != max_mru_default) | 1121 | if (cxt1e1_max_mru != max_mru_default) |
1122 | pr_info("NOTE: driver parameter <cxt1e1_max_mru> changed from default %d to %d.\n", | 1122 | pr_info("NOTE: driver parameter <cxt1e1_max_mru> changed from default %d to %d.\n", |
1123 | max_mru_default, cxt1e1_max_mru); | 1123 | max_mru_default, cxt1e1_max_mru); |