diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2008-10-27 20:47:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-27 20:47:26 -0400 |
commit | 7c510e4b730a92cecf94ada45c989d8be0200d47 (patch) | |
tree | 61f1926964c580946367588602a8eb039561f077 /drivers/media | |
parent | e174961ca1a0b28f7abf0be47973ad57cb74e5f0 (diff) |
net: convert more to %pM
A number of places still use %02x:...:%02x because it's
in debug statements or for no real reason. Make a few
of them use %pM.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/dvb/b2c2/flexcop.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/bt8xx/dst.c | 4 | ||||
-rw-r--r-- | drivers/media/dvb/dm1105/dm1105.c | 3 | ||||
-rw-r--r-- | drivers/media/dvb/dvb-usb/dvb-usb-dvb.c | 5 | ||||
-rw-r--r-- | drivers/media/dvb/pluto2/pluto2.c | 3 |
5 files changed, 5 insertions, 12 deletions
diff --git a/drivers/media/dvb/b2c2/flexcop.c b/drivers/media/dvb/b2c2/flexcop.c index 5f79c8dc3836..676413a915b4 100644 --- a/drivers/media/dvb/b2c2/flexcop.c +++ b/drivers/media/dvb/b2c2/flexcop.c | |||
@@ -270,7 +270,7 @@ int flexcop_device_initialize(struct flexcop_device *fc) | |||
270 | /* do the MAC address reading after initializing the dvb_adapter */ | 270 | /* do the MAC address reading after initializing the dvb_adapter */ |
271 | if (fc->get_mac_addr(fc, 0) == 0) { | 271 | if (fc->get_mac_addr(fc, 0) == 0) { |
272 | u8 *b = fc->dvb_adapter.proposed_mac; | 272 | u8 *b = fc->dvb_adapter.proposed_mac; |
273 | info("MAC address = %02x:%02x:%02x:%02x:%02x:%02x", b[0],b[1],b[2],b[3],b[4],b[5]); | 273 | info("MAC address = %pM", b); |
274 | flexcop_set_mac_filter(fc,b); | 274 | flexcop_set_mac_filter(fc,b); |
275 | flexcop_mac_filter_ctrl(fc,1); | 275 | flexcop_mac_filter_ctrl(fc,1); |
276 | } else | 276 | } else |
diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c index aa3db57d32d9..29e8f1546ab6 100644 --- a/drivers/media/dvb/bt8xx/dst.c +++ b/drivers/media/dvb/bt8xx/dst.c | |||
@@ -917,9 +917,7 @@ static int dst_get_mac(struct dst_state *state) | |||
917 | } | 917 | } |
918 | memset(&state->mac_address, '\0', 8); | 918 | memset(&state->mac_address, '\0', 8); |
919 | memcpy(&state->mac_address, &state->rxbuffer, 6); | 919 | memcpy(&state->mac_address, &state->rxbuffer, 6); |
920 | dprintk(verbose, DST_ERROR, 1, "MAC Address=[%02x:%02x:%02x:%02x:%02x:%02x]", | 920 | dprintk(verbose, DST_ERROR, 1, "MAC Address=[%pM]", state->mac_address); |
921 | state->mac_address[0], state->mac_address[1], state->mac_address[2], | ||
922 | state->mac_address[4], state->mac_address[5], state->mac_address[6]); | ||
923 | 921 | ||
924 | return 0; | 922 | return 0; |
925 | } | 923 | } |
diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c index 14e627ef6465..d15984e599bc 100644 --- a/drivers/media/dvb/dm1105/dm1105.c +++ b/drivers/media/dvb/dm1105/dm1105.c | |||
@@ -697,8 +697,7 @@ static void __devinit dm1105dvb_read_mac(struct dm1105dvb *dm1105dvb, u8 *mac) | |||
697 | }; | 697 | }; |
698 | 698 | ||
699 | dm1105_i2c_xfer(&dm1105dvb->i2c_adap, msg , 2); | 699 | dm1105_i2c_xfer(&dm1105dvb->i2c_adap, msg , 2); |
700 | dev_info(&dm1105dvb->pdev->dev, "MAC %02x:%02x:%02x:%02x:%02x:%02x\n", | 700 | dev_info(&dm1105dvb->pdev->dev, "MAC %pM\n", mac); |
701 | mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); | ||
702 | } | 701 | } |
703 | 702 | ||
704 | static int __devinit dm1105_probe(struct pci_dev *pdev, | 703 | static int __devinit dm1105_probe(struct pci_dev *pdev, |
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c index ce8cd0c5d831..8a7d87bcd1d9 100644 --- a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c +++ b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c | |||
@@ -91,10 +91,7 @@ int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap, short *adapter_nums) | |||
91 | 91 | ||
92 | if (adap->dev->props.read_mac_address) { | 92 | if (adap->dev->props.read_mac_address) { |
93 | if (adap->dev->props.read_mac_address(adap->dev,adap->dvb_adap.proposed_mac) == 0) | 93 | if (adap->dev->props.read_mac_address(adap->dev,adap->dvb_adap.proposed_mac) == 0) |
94 | info("MAC address: %02x:%02x:%02x:%02x:%02x:%02x",adap->dvb_adap.proposed_mac[0], | 94 | info("MAC address: %pM",adap->dvb_adap.proposed_mac); |
95 | adap->dvb_adap.proposed_mac[1], adap->dvb_adap.proposed_mac[2], | ||
96 | adap->dvb_adap.proposed_mac[3], adap->dvb_adap.proposed_mac[4], | ||
97 | adap->dvb_adap.proposed_mac[5]); | ||
98 | else | 95 | else |
99 | err("MAC address reading failed."); | 96 | err("MAC address reading failed."); |
100 | } | 97 | } |
diff --git a/drivers/media/dvb/pluto2/pluto2.c b/drivers/media/dvb/pluto2/pluto2.c index a9653c63f4db..d101b304e9b0 100644 --- a/drivers/media/dvb/pluto2/pluto2.c +++ b/drivers/media/dvb/pluto2/pluto2.c | |||
@@ -560,8 +560,7 @@ static void __devinit pluto_read_mac(struct pluto *pluto, u8 *mac) | |||
560 | mac[4] = (val >> 8) & 0xff; | 560 | mac[4] = (val >> 8) & 0xff; |
561 | mac[5] = (val >> 0) & 0xff; | 561 | mac[5] = (val >> 0) & 0xff; |
562 | 562 | ||
563 | dev_info(&pluto->pdev->dev, "MAC %02x:%02x:%02x:%02x:%02x:%02x\n", | 563 | dev_info(&pluto->pdev->dev, "MAC %pM\n", mac); |
564 | mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); | ||
565 | } | 564 | } |
566 | 565 | ||
567 | static int __devinit pluto_read_serial(struct pluto *pluto) | 566 | static int __devinit pluto_read_serial(struct pluto *pluto) |