From 50a7d1922dc6c7425c0da99e6b736b37eafe1585 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Sat, 11 Sep 2010 14:33:27 -0300 Subject: [PATCH] --- yaml --- r: 219427 b: refs/heads/master c: 0e44dec17f8b8737f47c9f547b6674b9921612b9 h: refs/heads/master i: 219425: 4deb850c73494f940b2a0b1f706e1fd013d66eb8 219423: 4820c78db2191d0bc5b8d2069eee97361fc8581d v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/mantis/mantis_core.c | 5 +---- trunk/drivers/media/dvb/mantis/mantis_ioc.c | 9 +-------- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 4458e3b61b7d..3c46a976527b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d639609061e7ddcd4220c7bcbefd6cb0789454ee +refs/heads/master: 0e44dec17f8b8737f47c9f547b6674b9921612b9 diff --git a/trunk/drivers/media/dvb/mantis/mantis_core.c b/trunk/drivers/media/dvb/mantis/mantis_core.c index 8113b23ce448..22524a8e6f61 100644 --- a/trunk/drivers/media/dvb/mantis/mantis_core.c +++ b/trunk/drivers/media/dvb/mantis/mantis_core.c @@ -91,10 +91,7 @@ static int get_mac_address(struct mantis_pci *mantis) return err; } dprintk(verbose, MANTIS_ERROR, 0, - " MAC Address=[%02x:%02x:%02x:%02x:%02x:%02x]\n", - mantis->mac_address[0], mantis->mac_address[1], - mantis->mac_address[2], mantis->mac_address[3], - mantis->mac_address[4], mantis->mac_address[5]); + " MAC Address=[%pM]\n", mantis->mac_address); return 0; } diff --git a/trunk/drivers/media/dvb/mantis/mantis_ioc.c b/trunk/drivers/media/dvb/mantis/mantis_ioc.c index de148ded52d8..fe31cfb0b158 100644 --- a/trunk/drivers/media/dvb/mantis/mantis_ioc.c +++ b/trunk/drivers/media/dvb/mantis/mantis_ioc.c @@ -68,14 +68,7 @@ int mantis_get_mac(struct mantis_pci *mantis) return err; } - dprintk(MANTIS_ERROR, 0, - " MAC Address=[%02x:%02x:%02x:%02x:%02x:%02x]\n", - mac_addr[0], - mac_addr[1], - mac_addr[2], - mac_addr[3], - mac_addr[4], - mac_addr[5]); + dprintk(MANTIS_ERROR, 0, " MAC Address=[%pM]\n", mac_addr); return 0; }