[PATCH] libertas: get rid of libertas_sbi_get_priv() (1ac812f1) · Commits · 戴 / test

drivers/net/wireless/libertas/decl.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -78,7 +78,7 @@ int reset_device(wlan_private *priv);
		extern struct chan_freq_power *libertas_get_region_cfp_table(u8 region, u8 band,
		int *cfp_no);
		wlan_private wlan_add_card(void card);
		int wlan_remove_card(void *card);
		int wlan_remove_card(wlan_private *priv);
		int wlan_add_mesh(wlan_private *priv);
		void wlan_remove_mesh(wlan_private *priv);

+1 −12

Original line number	Diff line number	Diff line
		@@ -231,7 +231,7 @@ static void if_usb_disconnect(struct usb_interface *intf)
		/* card is removed and we can call wlan_remove_card */
		lbs_deb_usbd(&cardp->udev->dev, "call remove card\n");
		wlan_remove_mesh(priv);
		wlan_remove_card(cardp);
		wlan_remove_card(priv);

		/* Unlink and free urb */
		if_usb_free(cardp);
		@@ -854,17 +854,6 @@ done:
		return ret;
		}

		/**
		* @brief Given a usb_card_rec return its wlan_private
		* @param card pointer to a usb_card_rec
		* @return pointer to wlan_private
		*/
		wlan_private libertas_sbi_get_priv(void card)
		{
		struct usb_card_rec *cardp = card;
		return cardp->priv;
		}

		#ifdef CONFIG_PM
		static int if_usb_suspend(struct usb_interface *intf, pm_message_t message)
		{

+1 −2

Original line number	Diff line number	Diff line
		@@ -963,9 +963,8 @@ static void wake_pending_cmdnodes(wlan_private *priv)
		}


		int wlan_remove_card(void *card)
		int wlan_remove_card(wlan_private *priv)
		{
		wlan_private *priv = libertas_sbi_get_priv(card);
		wlan_adapter *adapter;
		struct net_device *dev;
		union iwreq_data wrqu;

+0 −1

Original line number	Diff line number	Diff line
		@@ -26,6 +26,5 @@ int libertas_sbi_prog_firmware(wlan_private *);

		int libertas_sbi_read_event_cause(wlan_private *);
		int libertas_sbi_host_to_card(wlan_private * priv, u8 type, u8 * payload, u16 nb);
		wlan_private libertas_sbi_get_priv(void card);

		#endif /* _SBI_H */