OSDN Git Service

staging: rtl8192e: Remove one of two checks for hardware RTL8192SE
authorPhilipp Hortmann <philipp.g.hortmann@gmail.com>
Fri, 7 Apr 2023 21:50:34 +0000 (23:50 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 15 Apr 2023 16:03:59 +0000 (18:03 +0200)
Check for hardware RTL8192SE is done in function _rtl92e_pci_probe()
directly and also two lines later in function rtl92e_check_adapter().
Remove top level check to increase readability.
This pci_read does not follow a pci_write to ensure data is written to
the device.

Signed-off-by: Philipp Hortmann <philipp.g.hortmann@gmail.com>
Link: https://lore.kernel.org/r/4126cca73739c75b1a0379af2ef8b0c63a705639.1680902603.git.philipp.g.hortmann@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8192e/rtl8192e/rtl_core.c

index 7506d7e..45989a7 100644 (file)
@@ -2130,7 +2130,6 @@ static int _rtl92e_pci_probe(struct pci_dev *pdev,
        struct r8192_priv *priv = NULL;
        unsigned long pmem_start, pmem_len, pmem_flags;
        int err = -ENOMEM;
-       u8 revision_id;
 
        if (pci_enable_device(pdev)) {
                dev_err(&pdev->dev, "Failed to enable PCI device");
@@ -2189,11 +2188,6 @@ static int _rtl92e_pci_probe(struct pci_dev *pdev,
        dev->mem_start = ioaddr;
        dev->mem_end = ioaddr + pci_resource_len(pdev, 0);
 
-       pci_read_config_byte(pdev, 0x08, &revision_id);
-       /* If the revisionid is 0x10, the device uses rtl8192se. */
-       if (pdev->device == 0x8192 && revision_id == 0x10)
-               goto err_unmap;
-
        if (!rtl92e_check_adapter(pdev, dev))
                goto err_unmap;