hc
2024-02-20 102a0743326a03cd1a1202ceda21e175b7d3575c
kernel/drivers/ssb/pci.c
....@@ -305,7 +305,6 @@
305305 else if (i % 2)
306306 pr_cont(".");
307307 writew(sprom[i], bus->mmio + bus->sprom_offset + (i * 2));
308
- mmiowb();
309308 msleep(20);
310309 }
311310 err = pci_read_config_dword(pdev, SSB_SPROMCTL, &spromctl);
....@@ -596,7 +595,7 @@
596595 {
597596 int i;
598597 u16 o;
599
- u16 pwr_info_offset[] = {
598
+ static const u16 pwr_info_offset[] = {
600599 SSB_SROM8_PWR_INFO_CORE0, SSB_SROM8_PWR_INFO_CORE1,
601600 SSB_SROM8_PWR_INFO_CORE2, SSB_SROM8_PWR_INFO_CORE3
602601 };
....@@ -1165,17 +1164,12 @@
11651164 int ssb_pci_init(struct ssb_bus *bus)
11661165 {
11671166 struct pci_dev *pdev;
1168
- int err;
11691167
11701168 if (bus->bustype != SSB_BUSTYPE_PCI)
11711169 return 0;
11721170
11731171 pdev = bus->host_pci;
11741172 mutex_init(&bus->sprom_mutex);
1175
- err = device_create_file(&pdev->dev, &dev_attr_ssb_sprom);
1176
- if (err)
1177
- goto out;
11781173
1179
-out:
1180
- return err;
1174
+ return device_create_file(&pdev->dev, &dev_attr_ssb_sprom);
11811175 }