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

Commit d892cc1c authored by Sergio Paracuellos's avatar Sergio Paracuellos Committed by Greg Kroah-Hartman
Browse files

staging: ks7010: change name and type for device_open_status field 



This commit changes type for device_open_status field of ks_wlan_private
structure from int to bool. This variable is only be set to 1
on ks_wlan_net_start and set to 0 on ks_wlan_net_stop. For this
purpose it is not necessary at all to use an integer because a bool
is enough. This also renames field name from device_open_status to
is_device_open.

Signed-off-by: default avatarSergio Paracuellos <sergio.paracuellos@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 06176b87

drivers/staging/ks7010/ks_hostif.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1562,7 +1562,7 @@ void hostif_mic_failure_request(struct ks_wlan_private *priv, 
static void devio_rec_ind(struct ks_wlan_private *priv, unsigned char *p,

static void devio_rec_ind(struct ks_wlan_private *priv, unsigned char *p,

			  unsigned int size)

			  unsigned int size)

{

{

	if (priv->device_open_status) {

	if (priv->is_device_open) {

		spin_lock(&priv->dev_read_lock);	/* request spin lock */

		spin_lock(&priv->dev_read_lock);	/* request spin lock */

		priv->dev_data[atomic_read(&priv->rec_count)] = p;

		priv->dev_data[atomic_read(&priv->rec_count)] = p;

		priv->dev_size[atomic_read(&priv->rec_count)] = size;

		priv->dev_size[atomic_read(&priv->rec_count)] = size;

drivers/staging/ks7010/ks_wlan.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -424,7 +424,7 @@ struct ks_wlan_private { 
	unsigned int need_commit;	/* for ioctl */

	unsigned int need_commit;	/* for ioctl */





	/* DeviceIoControl */

	/* DeviceIoControl */

	bool device_open_status;

	bool is_device_open;

	atomic_t event_count;

	atomic_t event_count;

	atomic_t rec_count;

	atomic_t rec_count;

	int dev_count;

	int dev_count;

drivers/staging/ks7010/ks_wlan_net.c

+2 −3
Original line number Original line Diff line number Diff line
@@ -2816,9 +2816,8 @@ int ks_wlan_net_start(struct net_device *dev) 




	priv = netdev_priv(dev);

	priv = netdev_priv(dev);

	priv->mac_address_valid = false;

	priv->mac_address_valid = false;

	priv->device_open_status = true;

	priv->is_device_open = true;

	priv->need_commit = 0;

	priv->need_commit = 0;



	/* phy information update timer */

	/* phy information update timer */

	atomic_set(&update_phyinfo, 0);

	atomic_set(&update_phyinfo, 0);

	timer_setup(&update_phyinfo_timer, ks_wlan_update_phyinfo_timeout, 0);

	timer_setup(&update_phyinfo_timer, ks_wlan_update_phyinfo_timeout, 0);
@@ -2848,7 +2847,7 @@ int ks_wlan_net_stop(struct net_device *dev) 
{

{

	struct ks_wlan_private *priv = netdev_priv(dev);

	struct ks_wlan_private *priv = netdev_priv(dev);





	priv->device_open_status = false;

	priv->is_device_open = false;

	del_timer_sync(&update_phyinfo_timer);

	del_timer_sync(&update_phyinfo_timer);





	if (netif_running(dev))

	if (netif_running(dev))