Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 (775d8d93) · Commits · e / devices / android_kernel_oneplus_sm8150

drivers/net/wireless/ar9170/usb.c

+90 −20

Original line number	Diff line number	Diff line
		@@ -623,6 +623,39 @@ static int ar9170_usb_open(struct ar9170 *ar)
		return 0;
		}

		static int ar9170_usb_init_device(struct ar9170_usb *aru)
		{
		int err;

		err = ar9170_usb_alloc_rx_irq_urb(aru);
		if (err)
		goto err_out;

		err = ar9170_usb_alloc_rx_bulk_urbs(aru);
		if (err)
		goto err_unrx;

		err = ar9170_usb_upload_firmware(aru);
		if (err) {
		err = ar9170_echo_test(&aru->common, 0x60d43110);
		if (err) {
		/* force user invention, by disabling the device */
		err = usb_driver_set_configuration(aru->udev, -1);
		dev_err(&aru->udev->dev, "device is in a bad state. "
		"please reconnect it!\n");
		goto err_unrx;
		}
		}

		return 0;

		err_unrx:
		ar9170_usb_cancel_urbs(aru);

		err_out:
		return err;
		}

		static int ar9170_usb_probe(struct usb_interface *intf,
		const struct usb_device_id *id)
		{
		@@ -658,32 +691,16 @@ static int ar9170_usb_probe(struct usb_interface *intf,

		err = ar9170_usb_reset(aru);
		if (err)
		goto err_unlock;
		goto err_freehw;

		err = ar9170_usb_request_firmware(aru);
		if (err)
		goto err_unlock;
		goto err_freehw;

		err = ar9170_usb_alloc_rx_irq_urb(aru);
		err = ar9170_usb_init_device(aru);
		if (err)
		goto err_freefw;

		err = ar9170_usb_alloc_rx_bulk_urbs(aru);
		if (err)
		goto err_unrx;

		err = ar9170_usb_upload_firmware(aru);
		if (err) {
		err = ar9170_echo_test(&aru->common, 0x60d43110);
		if (err) {
		/* force user invention, by disabling the device */
		err = usb_driver_set_configuration(aru->udev, -1);
		dev_err(&aru->udev->dev, "device is in a bad state. "
		"please reconnect it!\n");
		goto err_unrx;
		}
		}

		err = ar9170_usb_open(ar);
		if (err)
		goto err_unrx;
		@@ -703,7 +720,7 @@ static int ar9170_usb_probe(struct usb_interface *intf,
		release_firmware(aru->init_values);
		release_firmware(aru->firmware);

		err_unlock:
		err_freehw:
		usb_set_intfdata(intf, NULL);
		usb_put_dev(udev);
		ieee80211_free_hw(ar->hw);
		@@ -730,12 +747,65 @@ static void ar9170_usb_disconnect(struct usb_interface *intf)
		ieee80211_free_hw(aru->common.hw);
		}

		#ifdef CONFIG_PM
		static int ar9170_suspend(struct usb_interface *intf,
		pm_message_t message)
		{
		struct ar9170_usb *aru = usb_get_intfdata(intf);

		if (!aru)
		return -ENODEV;

		aru->common.state = AR9170_IDLE;
		ar9170_usb_cancel_urbs(aru);

		return 0;
		}

		static int ar9170_resume(struct usb_interface *intf)
		{
		struct ar9170_usb *aru = usb_get_intfdata(intf);
		int err;

		if (!aru)
		return -ENODEV;

		usb_unpoison_anchored_urbs(&aru->rx_submitted);
		usb_unpoison_anchored_urbs(&aru->tx_submitted);

		/*
		* FIXME: firmware upload will fail on resume.
		* but this is better than a hang!
		*/

		err = ar9170_usb_init_device(aru);
		if (err)
		goto err_unrx;

		err = ar9170_usb_open(&aru->common);
		if (err)
		goto err_unrx;

		return 0;

		err_unrx:
		aru->common.state = AR9170_IDLE;
		ar9170_usb_cancel_urbs(aru);

		return err;
		}
		#endif /* CONFIG_PM */

		static struct usb_driver ar9170_driver = {
		.name = "ar9170usb",
		.probe = ar9170_usb_probe,
		.disconnect = ar9170_usb_disconnect,
		.id_table = ar9170_usb_ids,
		.soft_unbind = 1,
		#ifdef CONFIG_PM
		.suspend = ar9170_suspend,
		.resume = ar9170_resume,
		#endif /* CONFIG_PM */
		};

		static int __init ar9170_init(void)

drivers/net/wireless/mwl8k.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -3720,12 +3720,12 @@ static int __devinit mwl8k_probe(struct pci_dev *pdev,
		return rc;
		}

		static void __devexit mwl8k_remove(struct pci_dev *pdev)
		static void __devexit mwl8k_shutdown(struct pci_dev *pdev)
		{
		printk(KERN_ERR "===>%s(%u)\n", __func__, __LINE__);
		}

		static void __devexit mwl8k_shutdown(struct pci_dev *pdev)
		static void __devexit mwl8k_remove(struct pci_dev *pdev)
		{
		struct ieee80211_hw *hw = pci_get_drvdata(pdev);
		struct mwl8k_priv *priv;

drivers/net/wireless/p54/p54common.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -2543,8 +2543,6 @@ struct ieee80211_hw *p54_init_common(size_t priv_data_len)
		priv->basic_rate_mask = 0x15f;
		skb_queue_head_init(&priv->tx_queue);
		dev->flags = IEEE80211_HW_RX_INCLUDES_FCS \|
		IEEE80211_HW_SUPPORTS_PS \|
		IEEE80211_HW_PS_NULLFUNC_STACK \|
		IEEE80211_HW_SIGNAL_DBM \|
		IEEE80211_HW_NOISE_DBM;

drivers/net/wireless/rt2x00/rt2x00pci.c

+1 −17

Original line number	Diff line number	Diff line
		@@ -369,8 +369,6 @@ int rt2x00pci_suspend(struct pci_dev *pci_dev, pm_message_t state)
		if (retval)
		return retval;

		rt2x00pci_free_reg(rt2x00dev);

		pci_save_state(pci_dev);
		pci_disable_device(pci_dev);
		return pci_set_power_state(pci_dev, pci_choose_state(pci_dev, state));
		@@ -381,7 +379,6 @@ int rt2x00pci_resume(struct pci_dev *pci_dev)
		{
		struct ieee80211_hw *hw = pci_get_drvdata(pci_dev);
		struct rt2x00_dev *rt2x00dev = hw->priv;
		int retval;

		if (pci_set_power_state(pci_dev, PCI_D0) \|\|
		pci_enable_device(pci_dev) \|\|
		@@ -390,20 +387,7 @@ int rt2x00pci_resume(struct pci_dev *pci_dev)
		return -EIO;
		}

		retval = rt2x00pci_alloc_reg(rt2x00dev);
		if (retval)
		return retval;

		retval = rt2x00lib_resume(rt2x00dev);
		if (retval)
		goto exit_free_reg;

		return 0;

		exit_free_reg:
		rt2x00pci_free_reg(rt2x00dev);

		return retval;
		return rt2x00lib_resume(rt2x00dev);
		}
		EXPORT_SYMBOL_GPL(rt2x00pci_resume);
		#endif /* CONFIG_PM */

drivers/net/wireless/rt2x00/rt2x00usb.c

+1 −17

Original line number	Diff line number	Diff line
		@@ -702,8 +702,6 @@ int rt2x00usb_suspend(struct usb_interface *usb_intf, pm_message_t state)
		if (retval)
		return retval;

		rt2x00usb_free_reg(rt2x00dev);

		/*
		* Decrease usbdev refcount.
		*/
		@@ -717,24 +715,10 @@ int rt2x00usb_resume(struct usb_interface *usb_intf)
		{
		struct ieee80211_hw *hw = usb_get_intfdata(usb_intf);
		struct rt2x00_dev *rt2x00dev = hw->priv;
		int retval;

		usb_get_dev(interface_to_usbdev(usb_intf));

		retval = rt2x00usb_alloc_reg(rt2x00dev);
		if (retval)
		return retval;

		retval = rt2x00lib_resume(rt2x00dev);
		if (retval)
		goto exit_free_reg;

		return 0;

		exit_free_reg:
		rt2x00usb_free_reg(rt2x00dev);

		return retval;
		return rt2x00lib_resume(rt2x00dev);
		}
		EXPORT_SYMBOL_GPL(rt2x00usb_resume);
		#endif /* CONFIG_PM */