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

Commit 67d6bfa6 authored by Jingoo Han's avatar Jingoo Han Committed by David S. Miller
Browse files

net: ethernet: replace strict_strtoul() with kstrtoul() 



The usage of strict_strtoul() is not preferred, because
strict_strtoul() is obsolete. Thus, kstrtoul() should be
used.

Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0672f0ab

drivers/net/ethernet/qlogic/netxen/netxen_nic_main.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -2774,7 +2774,7 @@ netxen_store_bridged_mode(struct device *dev, 
	if (adapter->is_up != NETXEN_ADAPTER_UP_MAGIC)

	if (adapter->is_up != NETXEN_ADAPTER_UP_MAGIC)

		goto err_out;

		goto err_out;





	if (strict_strtoul(buf, 2, &new))

	if (kstrtoul(buf, 2, &new))

		goto err_out;

		goto err_out;





	if (!netxen_config_bridged_mode(adapter, !!new))

	if (!netxen_config_bridged_mode(adapter, !!new))
@@ -2813,7 +2813,7 @@ netxen_store_diag_mode(struct device *dev, 
	struct netxen_adapter *adapter = dev_get_drvdata(dev);

	struct netxen_adapter *adapter = dev_get_drvdata(dev);

	unsigned long new;

	unsigned long new;





	if (strict_strtoul(buf, 2, &new))

	if (kstrtoul(buf, 2, &new))

		return -EINVAL;

		return -EINVAL;





	if (!!new != !!(adapter->flags & NETXEN_NIC_DIAG_ENABLED))

	if (!!new != !!(adapter->flags & NETXEN_NIC_DIAG_ENABLED))

drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -47,7 +47,7 @@ static ssize_t qlcnic_store_bridged_mode(struct device *dev, 
	if (!test_bit(__QLCNIC_DEV_UP, &adapter->state))

	if (!test_bit(__QLCNIC_DEV_UP, &adapter->state))

		goto err_out;

		goto err_out;





	if (strict_strtoul(buf, 2, &new))

	if (kstrtoul(buf, 2, &new))

		goto err_out;

		goto err_out;





	if (!qlcnic_config_bridged_mode(adapter, !!new))

	if (!qlcnic_config_bridged_mode(adapter, !!new))
@@ -77,7 +77,7 @@ static ssize_t qlcnic_store_diag_mode(struct device *dev, 
	struct qlcnic_adapter *adapter = dev_get_drvdata(dev);

	struct qlcnic_adapter *adapter = dev_get_drvdata(dev);

	unsigned long new;

	unsigned long new;





	if (strict_strtoul(buf, 2, &new))

	if (kstrtoul(buf, 2, &new))

		return -EINVAL;

		return -EINVAL;





	if (!!new != !!(adapter->flags & QLCNIC_DIAG_ENABLED))

	if (!!new != !!(adapter->flags & QLCNIC_DIAG_ENABLED))