diff options
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-pci.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-pci.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-pci.c b/drivers/net/wireless/iwlwifi/iwl-pci.c index 7bab81928482..6451739aed2e 100644 --- a/drivers/net/wireless/iwlwifi/iwl-pci.c +++ b/drivers/net/wireless/iwlwifi/iwl-pci.c | |||
@@ -123,12 +123,14 @@ static void iwl_pci_apm_config(struct iwl_bus *bus) | |||
123 | /* L1-ASPM enabled; disable(!) L0S */ | 123 | /* L1-ASPM enabled; disable(!) L0S */ |
124 | iwl_set_bit(trans(bus), CSR_GIO_REG, | 124 | iwl_set_bit(trans(bus), CSR_GIO_REG, |
125 | CSR_GIO_REG_VAL_L0S_ENABLED); | 125 | CSR_GIO_REG_VAL_L0S_ENABLED); |
126 | dev_printk(KERN_INFO, bus->dev, "L1 Enabled; Disabling L0S\n"); | 126 | dev_printk(KERN_INFO, trans(bus)->dev, |
127 | "L1 Enabled; Disabling L0S\n"); | ||
127 | } else { | 128 | } else { |
128 | /* L1-ASPM disabled; enable(!) L0S */ | 129 | /* L1-ASPM disabled; enable(!) L0S */ |
129 | iwl_clear_bit(trans(bus), CSR_GIO_REG, | 130 | iwl_clear_bit(trans(bus), CSR_GIO_REG, |
130 | CSR_GIO_REG_VAL_L0S_ENABLED); | 131 | CSR_GIO_REG_VAL_L0S_ENABLED); |
131 | dev_printk(KERN_INFO, bus->dev, "L1 Disabled; Enabling L0S\n"); | 132 | dev_printk(KERN_INFO, trans(bus)->dev, |
133 | "L1 Disabled; Enabling L0S\n"); | ||
132 | } | 134 | } |
133 | } | 135 | } |
134 | 136 | ||
@@ -368,7 +370,6 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
368 | 370 | ||
369 | pci_set_drvdata(pdev, bus); | 371 | pci_set_drvdata(pdev, bus); |
370 | 372 | ||
371 | bus->dev = &pdev->dev; | ||
372 | bus->ops = &bus_ops_pci; | 373 | bus->ops = &bus_ops_pci; |
373 | 374 | ||
374 | #ifdef CONFIG_IWLWIFI_IDI | 375 | #ifdef CONFIG_IWLWIFI_IDI |