Commit 0296ef43 authored by Philipp Hortmann's avatar Philipp Hortmann Committed by Greg Kroah-Hartman
Browse files

staging: rtl8192e: Remove entry .nic_type from struct rtl819x_ops 



Remove unchanged entry .nic_type and replace it with constant NIC_8192E.
This increases readability of the code.

Signed-off-by: default avatarPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/f1fd37a2d2b90bef8caac31a98f3eeff404b3095.1677010997.git.philipp.g.hortmann@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5ac30dd2

drivers/staging/rtl8192e/rtl8192e/rtl_core.c

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ int hwwep = 1; 
static char *ifname = "wlan%d";



static const struct rtl819x_ops rtl819xp_ops = {

	.nic_type			= NIC_8192E,

};



static struct pci_device_id rtl8192_pci_id_tbl[] = {

drivers/staging/rtl8192e/rtl8192e/rtl_core.h

+0 −1
Original line number Diff line number Diff line
@@ -204,7 +204,6 @@ struct rtl8192_tx_ring { 
};



struct rtl819x_ops {

	enum nic_t nic_type;

};



struct r8192_priv {

drivers/staging/rtl8192e/rtl8192e/rtl_pci.c

+3 −3
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ bool rtl92e_check_adapter(struct pci_dev *pdev, struct net_device *dev) 
	revision_id = pdev->revision;

	pci_read_config_word(pdev, 0x3C, &irq_line);



	priv->card_8192 = priv->ops->nic_type;

	priv->card_8192 = NIC_8192E;



	if (device_id == 0x8192) {

		switch (revision_id) {
@@ -64,10 +64,10 @@ bool rtl92e_check_adapter(struct pci_dev *pdev, struct net_device *dev) 
		}

	}



	if (priv->ops->nic_type != priv->card_8192) {

	if (priv->card_8192 != NIC_8192E) {

		dev_info(&pdev->dev,

			 "Detect info(%x) and hardware info(%x) not match!\n",

			 priv->ops->nic_type, priv->card_8192);

			 NIC_8192E, priv->card_8192);

		dev_info(&pdev->dev,

			 "Please select proper driver before install!!!!\n");

		return false;