diff options
Diffstat (limited to 'drivers/media/dvb/bt8xx/dst_ca.c')
-rw-r--r-- | drivers/media/dvb/bt8xx/dst_ca.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/dvb/bt8xx/dst_ca.c b/drivers/media/dvb/bt8xx/dst_ca.c index 50bc32a8bd55..0258451423ad 100644 --- a/drivers/media/dvb/bt8xx/dst_ca.c +++ b/drivers/media/dvb/bt8xx/dst_ca.c | |||
@@ -36,13 +36,13 @@ | |||
36 | #define dprintk(x, y, z, format, arg...) do { \ | 36 | #define dprintk(x, y, z, format, arg...) do { \ |
37 | if (z) { \ | 37 | if (z) { \ |
38 | if ((x > DST_CA_ERROR) && (x > y)) \ | 38 | if ((x > DST_CA_ERROR) && (x > y)) \ |
39 | printk(KERN_ERR "%s: " format "\n", __FUNCTION__ , ##arg); \ | 39 | printk(KERN_ERR "%s: " format "\n", __func__ , ##arg); \ |
40 | else if ((x > DST_CA_NOTICE) && (x > y)) \ | 40 | else if ((x > DST_CA_NOTICE) && (x > y)) \ |
41 | printk(KERN_NOTICE "%s: " format "\n", __FUNCTION__ , ##arg); \ | 41 | printk(KERN_NOTICE "%s: " format "\n", __func__ , ##arg); \ |
42 | else if ((x > DST_CA_INFO) && (x > y)) \ | 42 | else if ((x > DST_CA_INFO) && (x > y)) \ |
43 | printk(KERN_INFO "%s: " format "\n", __FUNCTION__ , ##arg); \ | 43 | printk(KERN_INFO "%s: " format "\n", __func__ , ##arg); \ |
44 | else if ((x > DST_CA_DEBUG) && (x > y)) \ | 44 | else if ((x > DST_CA_DEBUG) && (x > y)) \ |
45 | printk(KERN_DEBUG "%s: " format "\n", __FUNCTION__ , ##arg); \ | 45 | printk(KERN_DEBUG "%s: " format "\n", __func__ , ##arg); \ |
46 | } else { \ | 46 | } else { \ |
47 | if (x > y) \ | 47 | if (x > y) \ |
48 | printk(format, ## arg); \ | 48 | printk(format, ## arg); \ |
@@ -162,7 +162,7 @@ static int ca_get_app_info(struct dst_state *state) | |||
162 | dprintk(verbose, DST_CA_INFO, 1, " ================================ CI Module Application Info ======================================"); | 162 | dprintk(verbose, DST_CA_INFO, 1, " ================================ CI Module Application Info ======================================"); |
163 | dprintk(verbose, DST_CA_INFO, 1, " Application Type=[%d], Application Vendor=[%d], Vendor Code=[%d]\n%s: Application info=[%s]", | 163 | dprintk(verbose, DST_CA_INFO, 1, " Application Type=[%d], Application Vendor=[%d], Vendor Code=[%d]\n%s: Application info=[%s]", |
164 | state->messages[7], (state->messages[8] << 8) | state->messages[9], | 164 | state->messages[7], (state->messages[8] << 8) | state->messages[9], |
165 | (state->messages[10] << 8) | state->messages[11], __FUNCTION__, (char *)(&state->messages[12])); | 165 | (state->messages[10] << 8) | state->messages[11], __func__, (char *)(&state->messages[12])); |
166 | dprintk(verbose, DST_CA_INFO, 1, " =================================================================================================="); | 166 | dprintk(verbose, DST_CA_INFO, 1, " =================================================================================================="); |
167 | 167 | ||
168 | // Transform dst message to correct application_info message | 168 | // Transform dst message to correct application_info message |