From: Todd Poynor <toddpoy...@google.com>

gasket_enable_dev code for enabling a gasket device with no physical PCI
device registered shouldn't be necessary.

Reported-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
Signed-off-by: Todd Poynor <toddpoy...@google.com>
---
 drivers/staging/gasket/gasket_core.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/drivers/staging/gasket/gasket_core.c 
b/drivers/staging/gasket/gasket_core.c
index 3f313fc54ff77..0a87bc67eac19 100644
--- a/drivers/staging/gasket/gasket_core.c
+++ b/drivers/staging/gasket/gasket_core.c
@@ -899,7 +899,6 @@ static int gasket_enable_dev(
 {
        int tbl_idx;
        int ret;
-       struct device *ddev;
        const struct gasket_driver_desc *driver_desc =
                internal_desc->driver_desc;
 
@@ -920,21 +919,12 @@ static int gasket_enable_dev(
        for (tbl_idx = 0; tbl_idx < driver_desc->num_page_tables; tbl_idx++) {
                gasket_log_debug(
                        gasket_dev, "Initializing page table %d.", tbl_idx);
-               if (gasket_dev->pci_dev) {
-                       ddev = &gasket_dev->pci_dev->dev;
-               } else {
-                       gasket_log_error(
-                               gasket_dev,
-                               "%s with no physical device!!", __func__);
-                       WARN_ON(1);
-                       ddev = NULL;
-               }
                ret = gasket_page_table_init(
                        &gasket_dev->page_table[tbl_idx],
                        &gasket_dev->bar_data[
                                driver_desc->page_table_bar_index],
                        &driver_desc->page_table_configs[tbl_idx],
-                       ddev, gasket_dev->pci_dev, true);
+                       &gasket_dev->pci_dev->dev, gasket_dev->pci_dev, true);
                if (ret) {
                        gasket_log_error(
                                gasket_dev,
-- 
2.18.0.203.gfac676dfb9-goog

Reply via email to