diff options
| author |   Mateusz Kulikowski <mateusz.kulikowski@gmail.com> | 2015-06-02 22:48:15 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-08 13:44:15 -0700 |
| commit | 9c2ce8275d62e9a78f17aa226c77e2e2a115c6bf (patch) | |
| tree | ff860457e7f317c4ef00e76007289ee232155651 | |
| parent | staging: rtl8192e: Remove dead code: r8192_priv members (diff) | |
| download | linux-dev-9c2ce8275d62e9a78f17aa226c77e2e2a115c6bf.tar.xz linux-dev-9c2ce8275d62e9a78f17aa226c77e2e2a115c6bf.zip | |
staging: rtl8192e: Remove dead code: mp_adapter
mp_adapter structure was used in past, but now is only initialized and
never read.
Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtl8192e/rtl_pci.c | 4 | ||||
| -rw-r--r-- | drivers/staging/rtl8192e/rtl8192e/rtl_pci.h | 17 |
3 files changed, 1 insertions, 22 deletions
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h index e1686cbd99a3..776d950655cb 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -344,8 +344,6 @@ struct r8192_priv { struct channel_access_setting ChannelAccessSetting; - struct mp_adapter NdisAdapter; - struct rtl819x_ops *ops; struct rtllib_device *rtllib; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_pci.c b/drivers/staging/rtl8192e/rtl8192e/rtl_pci.c index e8065c0ed05f..6bbd1c626e24 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_pci.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_pci.c @@ -34,10 +34,8 @@ static void rtl8192_parse_pci_configuration(struct pci_dev *pdev, u16 LinkCtrlReg; pcie_capability_read_word(priv->pdev, PCI_EXP_LNKCTL, &LinkCtrlReg); - priv->NdisAdapter.LinkCtrlReg = (u8)LinkCtrlReg; - RT_TRACE(COMP_INIT, "Link Control Register =%x\n", - priv->NdisAdapter.LinkCtrlReg); + RT_TRACE(COMP_INIT, "Link Control Register =%x\n", LinkCtrlReg); pci_read_config_byte(pdev, 0x98, &tmp); tmp |= BIT4; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_pci.h b/drivers/staging/rtl8192e/rtl8192e/rtl_pci.h index 4b94653c50d9..e8d5527a5f04 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_pci.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_pci.h @@ -28,23 +28,6 @@ #include <linux/types.h> #include <linux/pci.h> -struct mp_adapter { - u8 LinkCtrlReg; - - u8 BusNumber; - u8 DevNumber; - u8 FuncNumber; - - u8 PciBridgeBusNum; - u8 PciBridgeDevNum; - u8 PciBridgeFuncNum; - u8 PciBridgeVendor; - u16 PciBridgeVendorId; - u16 PciBridgeDeviceId; - u8 PciBridgePCIeHdrOffset; - u8 PciBridgeLinkCtrlReg; -}; - struct net_device; bool rtl8192_pci_findadapter(struct pci_dev *pdev, struct net_device *dev); |