.. | .. |
---|
305 | 305 | else if (i % 2) |
---|
306 | 306 | pr_cont("."); |
---|
307 | 307 | writew(sprom[i], bus->mmio + bus->sprom_offset + (i * 2)); |
---|
308 | | - mmiowb(); |
---|
309 | 308 | msleep(20); |
---|
310 | 309 | } |
---|
311 | 310 | err = pci_read_config_dword(pdev, SSB_SPROMCTL, &spromctl); |
---|
.. | .. |
---|
596 | 595 | { |
---|
597 | 596 | int i; |
---|
598 | 597 | u16 o; |
---|
599 | | - u16 pwr_info_offset[] = { |
---|
| 598 | + static const u16 pwr_info_offset[] = { |
---|
600 | 599 | SSB_SROM8_PWR_INFO_CORE0, SSB_SROM8_PWR_INFO_CORE1, |
---|
601 | 600 | SSB_SROM8_PWR_INFO_CORE2, SSB_SROM8_PWR_INFO_CORE3 |
---|
602 | 601 | }; |
---|
.. | .. |
---|
1165 | 1164 | int ssb_pci_init(struct ssb_bus *bus) |
---|
1166 | 1165 | { |
---|
1167 | 1166 | struct pci_dev *pdev; |
---|
1168 | | - int err; |
---|
1169 | 1167 | |
---|
1170 | 1168 | if (bus->bustype != SSB_BUSTYPE_PCI) |
---|
1171 | 1169 | return 0; |
---|
1172 | 1170 | |
---|
1173 | 1171 | pdev = bus->host_pci; |
---|
1174 | 1172 | mutex_init(&bus->sprom_mutex); |
---|
1175 | | - err = device_create_file(&pdev->dev, &dev_attr_ssb_sprom); |
---|
1176 | | - if (err) |
---|
1177 | | - goto out; |
---|
1178 | 1173 | |
---|
1179 | | -out: |
---|
1180 | | - return err; |
---|
| 1174 | + return device_create_file(&pdev->dev, &dev_attr_ssb_sprom); |
---|
1181 | 1175 | } |
---|