Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa9163b5 authored by Vaishali Thakkar's avatar Vaishali Thakkar Committed by Mauro Carvalho Chehab
Browse files

[media] ttpci: Replace memset with eth_zero_addr 



Use eth_zero_addr to assign the zero address to the given address
array instead of memset when second argument is address of zero.
Note that the 6 in the third argument of memset appears to represent
an ethernet address size (ETH_ALEN).

The Coccinelle semantic patch that makes this change is as follows:

// <smpl>
@eth_zero_addr@
expression e;
@@

-memset(e,0x00,6);
+eth_zero_addr(e);
// </smpl>

Signed-off-by: default avatarVaishali Thakkar <vthakkar1994@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@osg.samsung.com>
parent a73df858

drivers/media/pci/ttpci/budget-av.c

+1 −1
Original line number Diff line number Diff line
@@ -1508,7 +1508,7 @@ static int budget_av_attach(struct saa7146_dev *dev, struct saa7146_pci_extensio 
	if (i2c_readregs(&budget_av->budget.i2c_adap, 0xa0, 0x30, mac, 6)) {

		pr_err("KNC1-%d: Could not read MAC from KNC1 card\n",

		       budget_av->budget.dvb_adapter.num);

		memset(mac, 0, 6);

		eth_zero_addr(mac);

	} else {

		pr_info("KNC1-%d: MAC addr = %pM\n",

			budget_av->budget.dvb_adapter.num, mac);

drivers/media/pci/ttpci/ttpci-eeprom.c

+3 −2
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include <linux/module.h>

#include <linux/string.h>

#include <linux/i2c.h>

#include <linux/etherdevice.h>



#include "ttpci-eeprom.h"
@@ -145,7 +146,7 @@ int ttpci_eeprom_parse_mac(struct i2c_adapter *adapter, u8 *proposed_mac) 


	if (ret != 0) {		/* Will only be -ENODEV */

		dprintk("Couldn't read from EEPROM: not there?\n");

		memset(proposed_mac, 0, 6);

		eth_zero_addr(proposed_mac);

		return ret;

	}
@@ -157,7 +158,7 @@ int ttpci_eeprom_parse_mac(struct i2c_adapter *adapter, u8 *proposed_mac) 
			dprintk( "%.2x:", encodedMAC[i]);

		}

		dprintk("%.2x\n", encodedMAC[19]);

		memset(proposed_mac, 0, 6);

		eth_zero_addr(proposed_mac);

		return ret;

	}