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

Commit e000ea13 authored by David Brownell's avatar David Brownell Committed by Jeff Garzik
Browse files

net/usb/pegasus: avoid hundreds of diagnostics 



Make the "pegasus" driver scream less loudly in the face of
problems as it initializes, avoiding hundreds of messages:

 - ratelimit some key error messages
 - avoid some spurious diagnostics caused by strange codeflow

And fix one instance of goofy indentation.

Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 37b08e34

drivers/net/usb/pegasus.c

+6 −5
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static void ctrl_callback(struct urb *urb) 
	case -ENOENT:

		break;

	default:

		if (netif_msg_drv(pegasus))

		if (netif_msg_drv(pegasus) && printk_ratelimit())

			dev_dbg(&pegasus->intf->dev, "%s, status %d\n",

				__FUNCTION__, urb->status);

	}
@@ -166,7 +166,7 @@ static int get_registers(pegasus_t * pegasus, __u16 indx, __u16 size, 
		set_current_state(TASK_RUNNING);

		if (ret == -ENODEV)

			netif_device_detach(pegasus->net);

		if (netif_msg_drv(pegasus))

		if (netif_msg_drv(pegasus) && printk_ratelimit())

			dev_err(&pegasus->intf->dev, "%s, status %d\n",

					__FUNCTION__, ret);

		goto out;
@@ -275,7 +275,7 @@ static int set_register(pegasus_t * pegasus, __u16 indx, __u8 data) 
	if ((ret = usb_submit_urb(pegasus->ctrl_urb, GFP_ATOMIC))) {

		if (ret == -ENODEV)

			netif_device_detach(pegasus->net);

		if (netif_msg_drv(pegasus))

		if (netif_msg_drv(pegasus) && printk_ratelimit())

			dev_err(&pegasus->intf->dev, "%s, status %d\n",

					__FUNCTION__, ret);

		goto out;
@@ -1209,8 +1209,7 @@ static void pegasus_set_multicast(struct net_device *net) 
		pegasus->eth_regs[EthCtrl2] |= RX_PROMISCUOUS;

		if (netif_msg_link(pegasus))

			pr_info("%s: Promiscuous mode enabled.\n", net->name);

	} else if (net->mc_count ||

		   (net->flags & IFF_ALLMULTI)) {

	} else if (net->mc_count || (net->flags & IFF_ALLMULTI)) {

		pegasus->eth_regs[EthCtrl0] |= RX_MULTICAST;

		pegasus->eth_regs[EthCtrl2] &= ~RX_PROMISCUOUS;

		if (netif_msg_link(pegasus))
@@ -1220,6 +1219,8 @@ static void pegasus_set_multicast(struct net_device *net) 
		pegasus->eth_regs[EthCtrl2] &= ~RX_PROMISCUOUS;

	}



	pegasus->ctrl_urb->status = 0;



	pegasus->flags |= ETH_REGS_CHANGE;

	ctrl_callback(pegasus->ctrl_urb);

}