Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

PCI: Merge multi-line quoted strings

Merge quoted strings that are broken across lines into a single entity.
The compiler merges them anyway, but checkpatch complains about it, and
merging them makes it easier to grep for strings.

No functional change.

[bhelgaas: changelog, do the same for everything under drivers/pci]
Signed-off-by: Ryan Desfosses <ryan@desfo.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

authored by

Ryan Desfosses and committed by
Bjorn Helgaas
227f0647 3c78bc61

+169 -249
+1 -4
drivers/pci/access.c
··· 231 231 } 232 232 233 233 if (time_after(jiffies, timeout)) { 234 - dev_printk(KERN_DEBUG, &dev->dev, 235 - "vpd r/w failed. This is likely a firmware " 236 - "bug on this device. Contact the card " 237 - "vendor for a firmware update."); 234 + dev_printk(KERN_DEBUG, &dev->dev, "vpd r/w failed. This is likely a firmware bug on this device. Contact the card vendor for a firmware update\n"); 238 235 return -ETIMEDOUT; 239 236 } 240 237 if (fatal_signal_pending(current))
+4 -6
drivers/pci/host/pcie-rcar.c
··· 277 277 else if (size == 2) 278 278 *val = (*val >> (8 * (where & 2))) & 0xffff; 279 279 280 - dev_dbg(&bus->dev, "pcie-config-read: bus=%3d devfn=0x%04x " 281 - "where=0x%04x size=%d val=0x%08lx\n", bus->number, 282 - devfn, where, size, (unsigned long)*val); 280 + dev_dbg(&bus->dev, "pcie-config-read: bus=%3d devfn=0x%04x where=0x%04x size=%d val=0x%08lx\n", 281 + bus->number, devfn, where, size, (unsigned long)*val); 283 282 284 283 return ret; 285 284 } ··· 301 302 if (ret != PCIBIOS_SUCCESSFUL) 302 303 return ret; 303 304 304 - dev_dbg(&bus->dev, "pcie-config-write: bus=%3d devfn=0x%04x " 305 - "where=0x%04x size=%d val=0x%08lx\n", bus->number, 306 - devfn, where, size, (unsigned long)val); 305 + dev_dbg(&bus->dev, "pcie-config-write: bus=%3d devfn=0x%04x where=0x%04x size=%d val=0x%08lx\n", 306 + bus->number, devfn, where, size, (unsigned long)val); 307 307 308 308 if (size == 1) { 309 309 shift = 8 * (where & 3);
+2 -4
drivers/pci/hotplug/acpiphp_glue.c
··· 351 351 slot->slot = NULL; 352 352 bridge->nr_slots--; 353 353 if (retval == -EBUSY) 354 - pr_warn("Slot %llu already registered by another " 355 - "hotplug driver\n", sun); 354 + pr_warn("Slot %llu already registered by another hotplug driver\n", sun); 356 355 else 357 - pr_warn("acpiphp_register_hotplug_slot failed " 358 - "(err code = 0x%x)\n", retval); 356 + pr_warn("acpiphp_register_hotplug_slot failed (err code = 0x%x)\n", retval); 359 357 } 360 358 /* Even if the slot registration fails, we can still use it. */ 361 359 }
+2 -4
drivers/pci/hotplug/cpqphp_core.c
··· 706 706 hotplug_slot_info->adapter_status = 707 707 get_presence_status(ctrl, slot); 708 708 709 - dbg("registering bus %d, dev %d, number %d, " 710 - "ctrl->slot_device_offset %d, slot %d\n", 709 + dbg("registering bus %d, dev %d, number %d, ctrl->slot_device_offset %d, slot %d\n", 711 710 slot->bus, slot->device, 712 711 slot->number, ctrl->slot_device_offset, 713 712 slot_number); ··· 836 837 837 838 bus = pdev->subordinate; 838 839 if (!bus) { 839 - dev_notice(&pdev->dev, "the device is not a bridge, " 840 - "skipping\n"); 840 + dev_notice(&pdev->dev, "the device is not a bridge, skipping\n"); 841 841 rc = -ENODEV; 842 842 goto err_disable_device; 843 843 }
+4 -8
drivers/pci/hotplug/ibmphp_core.c
··· 1045 1045 rc = check_limitations(slot_cur); 1046 1046 if (rc) { 1047 1047 err("Adding this card exceeds the limitations of this bus.\n"); 1048 - err("(i.e., >1 133MHz cards running on same bus, or " 1049 - ">2 66 PCI cards running on same bus.\n"); 1048 + err("(i.e., >1 133MHz cards running on same bus, or >2 66 PCI cards running on same bus.\n"); 1050 1049 err("Try hot-adding into another bus\n"); 1051 1050 rc = -EINVAL; 1052 1051 goto error_nopower; ··· 1069 1070 !(SLOT_PWRGD(slot_cur->status))) 1070 1071 err("power fault occurred trying to power up\n"); 1071 1072 else if (SLOT_BUS_SPEED(slot_cur->status)) { 1072 - err("bus speed mismatch occurred. please check " 1073 - "current bus speed and card capability\n"); 1073 + err("bus speed mismatch occurred. please check current bus speed and card capability\n"); 1074 1074 print_card_capability(slot_cur); 1075 1075 } else if (SLOT_BUS_MODE(slot_cur->ext_status)) { 1076 - err("bus mode mismatch occurred. please check " 1077 - "current bus mode and card capability\n"); 1076 + err("bus mode mismatch occurred. please check current bus mode and card capability\n"); 1078 1077 print_card_capability(slot_cur); 1079 1078 } 1080 1079 ibmphp_update_slot_info(slot_cur); ··· 1095 1098 goto error_power; 1096 1099 } 1097 1100 if (SLOT_POWER(slot_cur->status) && (SLOT_BUS_SPEED(slot_cur->status))) { 1098 - err("bus speed mismatch occurred. please check current bus " 1099 - "speed and card capability\n"); 1101 + err("bus speed mismatch occurred. please check current bus speed and card capability\n"); 1100 1102 print_card_capability(slot_cur); 1101 1103 goto error_power; 1102 1104 }
+12 -20
drivers/pci/hotplug/ibmphp_pci.c
··· 137 137 "Please choose another device.\n", cur_func->device); 138 138 return -ENODEV; 139 139 } else if (class == PCI_CLASS_DISPLAY_VGA) { 140 - err ("The device %x is not supported for hot plugging. " 141 - "Please choose another device.\n", cur_func->device); 140 + err ("The device %x is not supported for hot plugging. Please choose another device.\n", 141 + cur_func->device); 142 142 return -ENODEV; 143 143 } 144 144 switch (hdr_type) { ··· 179 179 case PCI_HEADER_TYPE_MULTIBRIDGE: 180 180 class >>= 8; 181 181 if (class != PCI_CLASS_BRIDGE_PCI) { 182 - err ("This %x is not PCI-to-PCI bridge, and as is not supported for hot-plugging. " 183 - "Please insert another card.\n", cur_func->device); 182 + err ("This %x is not PCI-to-PCI bridge, and as is not supported for hot-plugging. Please insert another card.\n", 183 + cur_func->device); 184 184 return -ENODEV; 185 185 } 186 186 assign_alt_irq (cur_func, class_code); ··· 247 247 class >>= 8; 248 248 debug ("class now is %x\n", class); 249 249 if (class != PCI_CLASS_BRIDGE_PCI) { 250 - err ("This %x is not PCI-to-PCI bridge, and as is not supported for hot-plugging. " 251 - "Please insert another card.\n", cur_func->device); 250 + err ("This %x is not PCI-to-PCI bridge, and as is not supported for hot-plugging. Please insert another card.\n", 251 + cur_func->device); 252 252 return -ENODEV; 253 253 } 254 254 ··· 1125 1125 1126 1126 class >>= 8; /* to take revision out, class = class.subclass.prog i/f */ 1127 1127 if (class == PCI_CLASS_NOT_DEFINED_VGA) { 1128 - err ("The device %x is VGA compatible and as is not supported for hot plugging. " 1129 - "Please choose another device.\n", device); 1128 + err ("The device %x is VGA compatible and as is not supported for hot plugging. Please choose another device.\n", device); 1130 1129 amount->not_correct = 1; 1131 1130 return amount; 1132 1131 } else if (class == PCI_CLASS_DISPLAY_VGA) { 1133 - err ("The device %x is not supported for hot plugging. " 1134 - "Please choose another device.\n", device); 1132 + err ("The device %x is not supported for hot plugging. Please choose another device.\n", device); 1135 1133 amount->not_correct = 1; 1136 1134 return amount; 1137 1135 } ··· 1481 1483 debug ("hdr_type %x, class %x\n", hdr_type, class); 1482 1484 class >>= 8; /* to take revision out, class = class.subclass.prog i/f */ 1483 1485 if (class == PCI_CLASS_NOT_DEFINED_VGA) { 1484 - err ("The device %x function %x is VGA compatible and is not supported for hot removing. " 1485 - "Please choose another device.\n", device, function); 1486 + err ("The device %x function %x is VGA compatible and is not supported for hot removing. Please choose another device.\n", device, function); 1486 1487 return -ENODEV; 1487 1488 } else if (class == PCI_CLASS_DISPLAY_VGA) { 1488 - err ("The device %x function %x is not supported for hot removing. " 1489 - "Please choose another device.\n", device, function); 1489 + err ("The device %x function %x is not supported for hot removing. Please choose another device.\n", device, function); 1490 1490 return -ENODEV; 1491 1491 } 1492 1492 ··· 1509 1513 case PCI_HEADER_TYPE_BRIDGE: 1510 1514 class >>= 8; 1511 1515 if (class != PCI_CLASS_BRIDGE_PCI) { 1512 - err ("This device %x function %x is not PCI-to-PCI bridge, " 1513 - "and is not supported for hot-removing. " 1514 - "Please try another card.\n", device, function); 1516 + err ("This device %x function %x is not PCI-to-PCI bridge, and is not supported for hot-removing. Please try another card.\n", device, function); 1515 1517 return -ENODEV; 1516 1518 } 1517 1519 rc = unconfigure_boot_bridge (busno, device, function); ··· 1523 1529 case PCI_HEADER_TYPE_MULTIBRIDGE: 1524 1530 class >>= 8; 1525 1531 if (class != PCI_CLASS_BRIDGE_PCI) { 1526 - err ("This device %x function %x is not PCI-to-PCI bridge, " 1527 - "and is not supported for hot-removing. " 1528 - "Please try another card.\n", device, function); 1532 + err ("This device %x function %x is not PCI-to-PCI bridge, and is not supported for hot-removing. Please try another card.\n", device, function); 1529 1533 return -ENODEV; 1530 1534 } 1531 1535 rc = unconfigure_boot_bridge (busno, device, function);
+1 -2
drivers/pci/hotplug/ibmphp_res.c
··· 789 789 bus_cur = find_bus_wprev (res->busno, NULL, 0); 790 790 791 791 if (!bus_cur) { 792 - err ("cannot find corresponding bus of the io resource to remove " 793 - "bailing out...\n"); 792 + err ("cannot find corresponding bus of the io resource to remove bailing out...\n"); 794 793 return -ENODEV; 795 794 } 796 795
+1 -2
drivers/pci/hotplug/pci_hotplug_core.c
··· 432 432 if ((slot->info == NULL) || (slot->ops == NULL)) 433 433 return -EINVAL; 434 434 if (slot->release == NULL) { 435 - dbg("Why are you trying to register a hotplug slot " 436 - "without a proper release function?\n"); 435 + dbg("Why are you trying to register a hotplug slot without a proper release function?\n"); 437 436 return -EINVAL; 438 437 } 439 438
+1 -2
drivers/pci/hotplug/pciehp_core.c
··· 266 266 rc = init_slot(ctrl); 267 267 if (rc) { 268 268 if (rc == -EBUSY) 269 - ctrl_warn(ctrl, "Slot already registered by another " 270 - "hotplug driver\n"); 269 + ctrl_warn(ctrl, "Slot already registered by another hotplug driver\n"); 271 270 else 272 271 ctrl_err(ctrl, "Slot initialization failed\n"); 273 272 goto err_out_release_ctlr;
+6 -8
drivers/pci/hotplug/pciehp_ctrl.c
··· 376 376 pciehp_get_power_status(p_slot, &getstatus); 377 377 if (getstatus) { 378 378 p_slot->state = BLINKINGOFF_STATE; 379 - ctrl_info(ctrl, 380 - "PCI slot #%s - powering off due to button " 381 - "press.\n", slot_name(p_slot)); 379 + ctrl_info(ctrl, "PCI slot #%s - powering off due to button press\n", 380 + slot_name(p_slot)); 382 381 } else { 383 382 p_slot->state = BLINKINGON_STATE; 384 - ctrl_info(ctrl, 385 - "PCI slot #%s - powering on due to button " 386 - "press.\n", slot_name(p_slot)); 383 + ctrl_info(ctrl, "PCI slot #%s - powering on due to button press\n", 384 + slot_name(p_slot)); 387 385 } 388 386 /* blink green LED and turn off amber */ 389 387 pciehp_green_led_blink(p_slot); ··· 402 404 else 403 405 pciehp_green_led_off(p_slot); 404 406 pciehp_set_attention_status(p_slot, 0); 405 - ctrl_info(ctrl, "PCI slot #%s - action canceled " 406 - "due to button press\n", slot_name(p_slot)); 407 + ctrl_info(ctrl, "PCI slot #%s - action canceled due to button press\n", 408 + slot_name(p_slot)); 407 409 p_slot->state = STATIC_STATE; 408 410 break; 409 411 case POWEROFF_STATE:
+2 -4
drivers/pci/hotplug/pciehp_hpc.c
··· 174 174 * event even though it supports none of power 175 175 * controller, attention led, power led and EMI. 176 176 */ 177 - ctrl_dbg(ctrl, "Unexpected CMD_COMPLETED. Need to " 178 - "wait for command completed event.\n"); 177 + ctrl_dbg(ctrl, "Unexpected CMD_COMPLETED. Need to wait for command completed event\n"); 179 178 ctrl->no_cmd_complete = 0; 180 179 } else { 181 - ctrl_dbg(ctrl, "Unexpected CMD_COMPLETED. Maybe " 182 - "the controller is broken.\n"); 180 + ctrl_dbg(ctrl, "Unexpected CMD_COMPLETED. Maybe the controller is broken\n"); 183 181 } 184 182 } 185 183
+2 -3
drivers/pci/hotplug/pciehp_pci.c
··· 46 46 47 47 dev = pci_get_slot(parent, PCI_DEVFN(0, 0)); 48 48 if (dev) { 49 - ctrl_err(ctrl, "Device %s already exists " 50 - "at %04x:%02x:00, cannot hot-add\n", pci_name(dev), 51 - pci_domain_nr(parent), parent->number); 49 + ctrl_err(ctrl, "Device %s already exists at %04x:%02x:00, cannot hot-add\n", 50 + pci_name(dev), pci_domain_nr(parent), parent->number); 52 51 pci_dev_put(dev); 53 52 ret = -EEXIST; 54 53 goto out;
+11 -22
drivers/pci/hotplug/sgi_hotplug.c
··· 250 250 } 251 251 252 252 if (rc == PCI_L1_ERR) { 253 - dev_dbg(&slot->pci_bus->self->dev, 254 - "L1 failure %d with message: %s", 253 + dev_dbg(&slot->pci_bus->self->dev, "L1 failure %d with message: %s", 255 254 resp.resp_sub_errno, resp.resp_l1_msg); 256 255 return -EPERM; 257 256 } 258 257 259 258 if (rc) { 260 - dev_dbg(&slot->pci_bus->self->dev, 261 - "insert failed with error %d sub-error %d\n", 259 + dev_dbg(&slot->pci_bus->self->dev, "insert failed with error %d sub-error %d\n", 262 260 rc, resp.resp_sub_errno); 263 261 return -EIO; 264 262 } ··· 286 288 } 287 289 288 290 if ((action == PCI_REQ_SLOT_ELIGIBLE) && (rc == PCI_EMPTY_33MHZ)) { 289 - dev_dbg(&slot->pci_bus->self->dev, 290 - "Cannot remove last 33MHz card\n"); 291 + dev_dbg(&slot->pci_bus->self->dev, "Cannot remove last 33MHz card\n"); 291 292 return -EPERM; 292 293 } 293 294 294 295 if ((action == PCI_REQ_SLOT_ELIGIBLE) && (rc == PCI_L1_ERR)) { 295 - dev_dbg(&slot->pci_bus->self->dev, 296 - "L1 failure %d with message \n%s\n", 296 + dev_dbg(&slot->pci_bus->self->dev, "L1 failure %d with message \n%s\n", 297 297 resp.resp_sub_errno, resp.resp_l1_msg); 298 298 return -EPERM; 299 299 } 300 300 301 301 if ((action == PCI_REQ_SLOT_ELIGIBLE) && rc) { 302 - dev_dbg(&slot->pci_bus->self->dev, 303 - "remove failed with error %d sub-error %d\n", 302 + dev_dbg(&slot->pci_bus->self->dev, "remove failed with error %d sub-error %d\n", 304 303 rc, resp.resp_sub_errno); 305 304 return -EIO; 306 305 } ··· 412 417 phandle = acpi_device_handle(PCI_CONTROLLER(slot->pci_bus)->companion); 413 418 414 419 if (acpi_bus_get_device(phandle, &pdevice)) { 415 - dev_dbg(&slot->pci_bus->self->dev, 416 - "no parent device, assuming NULL\n"); 420 + dev_dbg(&slot->pci_bus->self->dev, "no parent device, assuming NULL\n"); 417 421 pdevice = NULL; 418 422 } 419 423 ··· 441 447 442 448 ret = acpi_bus_scan(chandle); 443 449 if (ACPI_FAILURE(ret)) { 444 - printk(KERN_ERR "%s: acpi_bus_scan " 445 - "failed (0x%x) for slot %d " 446 - "func %d\n", __func__, 447 - ret, (int)(adr>>16), 450 + printk(KERN_ERR "%s: acpi_bus_scan failed (0x%x) for slot %d func %d\n", 451 + __func__, ret, (int)(adr>>16), 448 452 (int)(adr&0xffff)); 449 453 /* try to continue on */ 450 454 } ··· 463 471 mutex_unlock(&sn_hotplug_mutex); 464 472 465 473 if (rc == 0) 466 - dev_dbg(&slot->pci_bus->self->dev, 467 - "insert operation successful\n"); 474 + dev_dbg(&slot->pci_bus->self->dev, "insert operation successful\n"); 468 475 else 469 - dev_dbg(&slot->pci_bus->self->dev, 470 - "insert operation failed rc = %d\n", rc); 476 + dev_dbg(&slot->pci_bus->self->dev, "insert operation failed rc = %d\n", rc); 471 477 472 478 return rc; 473 479 } ··· 551 561 acpi_status ret; 552 562 ret = acpi_unload_table_id(ssdt_id); 553 563 if (ACPI_FAILURE(ret)) { 554 - printk(KERN_ERR "%s: acpi_unload_table_id " 555 - "failed (0x%x) for id %d\n", 564 + printk(KERN_ERR "%s: acpi_unload_table_id failed (0x%x) for id %d\n", 556 565 __func__, ret, ssdt_id); 557 566 /* try to continue on */ 558 567 }
+1 -2
drivers/pci/hotplug/shpchp_core.c
··· 143 143 snprintf(name, SLOT_NAME_SIZE, "%d", slot->number); 144 144 hotplug_slot->ops = &shpchp_hotplug_slot_ops; 145 145 146 - ctrl_dbg(ctrl, "Registering domain:bus:dev=%04x:%02x:%02x " 147 - "hp_slot=%x sun=%x slot_device_offset=%x\n", 146 + ctrl_dbg(ctrl, "Registering domain:bus:dev=%04x:%02x:%02x hp_slot=%x sun=%x slot_device_offset=%x\n", 148 147 pci_domain_nr(ctrl->pci_dev->subordinate), 149 148 slot->bus, slot->device, slot->hp_slot, slot->number, 150 149 ctrl->slot_device_offset);
+16 -18
drivers/pci/hotplug/shpchp_ctrl.c
··· 196 196 197 197 ctrl_dbg(ctrl, "Change speed to %d\n", speed); 198 198 if ((rc = p_slot->hpc_ops->set_bus_speed_mode(p_slot, speed))) { 199 - ctrl_err(ctrl, "%s: Issue of set bus speed mode command " 200 - "failed\n", __func__); 199 + ctrl_err(ctrl, "%s: Issue of set bus speed mode command failed\n", 200 + __func__); 201 201 return WRONG_BUS_FREQUENCY; 202 202 } 203 203 return rc; ··· 215 215 */ 216 216 if (flag) { 217 217 if (asp < bsp) { 218 - ctrl_err(ctrl, "Speed of bus %x and adapter %x " 219 - "mismatch\n", bsp, asp); 218 + ctrl_err(ctrl, "Speed of bus %x and adapter %x mismatch\n", 219 + bsp, asp); 220 220 rc = WRONG_BUS_FREQUENCY; 221 221 } 222 222 return rc; ··· 250 250 251 251 hp_slot = p_slot->device - ctrl->slot_device_offset; 252 252 253 - ctrl_dbg(ctrl, 254 - "%s: p_slot->device, slot_offset, hp_slot = %d, %d ,%d\n", 253 + ctrl_dbg(ctrl, "%s: p_slot->device, slot_offset, hp_slot = %d, %d ,%d\n", 255 254 __func__, p_slot->device, ctrl->slot_device_offset, hp_slot); 256 255 257 256 /* Power on slot without connecting to bus */ ··· 262 263 263 264 if ((ctrl->pci_dev->vendor == 0x8086) && (ctrl->pci_dev->device == 0x0332)) { 264 265 if ((rc = p_slot->hpc_ops->set_bus_speed_mode(p_slot, PCI_SPEED_33MHz))) { 265 - ctrl_err(ctrl, "%s: Issue of set bus speed mode command" 266 - " failed\n", __func__); 266 + ctrl_err(ctrl, "%s: Issue of set bus speed mode command failed\n", 267 + __func__); 267 268 return WRONG_BUS_FREQUENCY; 268 269 } 269 270 ··· 276 277 277 278 rc = p_slot->hpc_ops->get_adapter_speed(p_slot, &asp); 278 279 if (rc) { 279 - ctrl_err(ctrl, "Can't get adapter speed or " 280 - "bus mode mismatch\n"); 280 + ctrl_err(ctrl, "Can't get adapter speed or bus mode mismatch\n"); 281 281 return WRONG_BUS_FREQUENCY; 282 282 } 283 283 ··· 287 289 if (!list_empty(&ctrl->pci_dev->subordinate->devices)) 288 290 slots_not_empty = 1; 289 291 290 - ctrl_dbg(ctrl, "%s: slots_not_empty %d, adapter_speed %d, bus_speed %d," 291 - " max_bus_speed %d\n", __func__, slots_not_empty, asp, 292 + ctrl_dbg(ctrl, "%s: slots_not_empty %d, adapter_speed %d, bus_speed %d, max_bus_speed %d\n", 293 + __func__, slots_not_empty, asp, 292 294 bsp, msp); 293 295 294 296 rc = fix_bus_speed(ctrl, p_slot, slots_not_empty, asp, bsp, msp); ··· 488 490 p_slot->hpc_ops->get_power_status(p_slot, &getstatus); 489 491 if (getstatus) { 490 492 p_slot->state = BLINKINGOFF_STATE; 491 - ctrl_info(ctrl, "PCI slot #%s - powering off due to " 492 - "button press.\n", slot_name(p_slot)); 493 + ctrl_info(ctrl, "PCI slot #%s - powering off due to button press\n", 494 + slot_name(p_slot)); 493 495 } else { 494 496 p_slot->state = BLINKINGON_STATE; 495 - ctrl_info(ctrl, "PCI slot #%s - powering on due to " 496 - "button press.\n", slot_name(p_slot)); 497 + ctrl_info(ctrl, "PCI slot #%s - powering on due to button press\n", 498 + slot_name(p_slot)); 497 499 } 498 500 /* blink green LED and turn off amber */ 499 501 p_slot->hpc_ops->green_led_blink(p_slot); ··· 516 518 else 517 519 p_slot->hpc_ops->green_led_off(p_slot); 518 520 p_slot->hpc_ops->set_attention_status(p_slot, 0); 519 - ctrl_info(ctrl, "PCI slot #%s - action canceled due to " 520 - "button press\n", slot_name(p_slot)); 521 + ctrl_info(ctrl, "PCI slot #%s - action canceled due to button press\n", 522 + slot_name(p_slot)); 521 523 p_slot->state = STATIC_STATE; 522 524 break; 523 525 case POWEROFF_STATE:
+7 -10
drivers/pci/hotplug/shpchp_hpc.c
··· 341 341 342 342 cmd_status = hpc_check_cmd_status(slot->ctrl); 343 343 if (cmd_status) { 344 - ctrl_err(ctrl, 345 - "Failed to issued command 0x%x (error code = %d)\n", 344 + ctrl_err(ctrl, "Failed to issued command 0x%x (error code = %d)\n", 346 345 cmd, cmd_status); 347 346 retval = -EIO; 348 347 } ··· 973 974 for (i = 0; i < 9 + num_slots; i++) { 974 975 rc = shpc_indirect_read(ctrl, i, &tempdword); 975 976 if (rc) { 976 - ctrl_err(ctrl, 977 - "Cannot read creg (index = %d)\n", i); 977 + ctrl_err(ctrl, "Cannot read creg (index = %d)\n", 978 + i); 978 979 goto abort; 979 980 } 980 981 ctrl_dbg(ctrl, " offset %d: value %x\n", i, tempdword); ··· 1059 1060 /* Installs the interrupt handler */ 1060 1061 rc = pci_enable_msi(pdev); 1061 1062 if (rc) { 1062 - ctrl_info(ctrl, 1063 - "Can't get msi for the hotplug controller\n"); 1064 - ctrl_info(ctrl, 1065 - "Use INTx for the hotplug controller\n"); 1063 + ctrl_info(ctrl, "Can't get msi for the hotplug controller\n"); 1064 + ctrl_info(ctrl, "Use INTx for the hotplug controller\n"); 1066 1065 } 1067 1066 1068 1067 rc = request_irq(ctrl->pci_dev->irq, shpc_isr, IRQF_SHARED, ··· 1068 1071 ctrl_dbg(ctrl, "request_irq %d (returns %d)\n", 1069 1072 ctrl->pci_dev->irq, rc); 1070 1073 if (rc) { 1071 - ctrl_err(ctrl, "Can't get irq %d for the hotplug " 1072 - "controller\n", ctrl->pci_dev->irq); 1074 + ctrl_err(ctrl, "Can't get irq %d for the hotplug controller\n", 1075 + ctrl->pci_dev->irq); 1073 1076 goto abort_iounmap; 1074 1077 } 1075 1078 }
+3 -3
drivers/pci/hotplug/shpchp_pci.c
··· 46 46 47 47 dev = pci_get_slot(parent, PCI_DEVFN(p_slot->device, 0)); 48 48 if (dev) { 49 - ctrl_err(ctrl, "Device %s already exists " 50 - "at %04x:%02x:%02x, cannot hot-add\n", pci_name(dev), 51 - pci_domain_nr(parent), p_slot->bus, p_slot->device); 49 + ctrl_err(ctrl, "Device %s already exists at %04x:%02x:%02x, cannot hot-add\n", 50 + pci_name(dev), pci_domain_nr(parent), 51 + p_slot->bus, p_slot->device); 52 52 pci_dev_put(dev); 53 53 ret = -EINVAL; 54 54 goto out;
+1 -2
drivers/pci/msi.c
··· 980 980 981 981 /* Check whether driver already requested for MSI irq */ 982 982 if (dev->msi_enabled) { 983 - dev_info(&dev->dev, "can't enable MSI-X " 984 - "(MSI IRQ already assigned)\n"); 983 + dev_info(&dev->dev, "can't enable MSI-X (MSI IRQ already assigned)\n"); 985 984 return -EINVAL; 986 985 } 987 986 status = msix_capability_init(dev, entries, nvec);
+4 -6
drivers/pci/pci-sysfs.c
··· 286 286 !!val) { 287 287 pdev->subordinate->bus_flags ^= PCI_BUS_FLAGS_NO_MSI; 288 288 289 - dev_warn(&pdev->dev, "forced subordinate bus to%s support MSI," 290 - " bad things could happen\n", val ? "" : " not"); 289 + dev_warn(&pdev->dev, "forced subordinate bus to%s support MSI, bad things could happen\n", 290 + val ? "" : " not"); 291 291 } 292 292 293 293 return count; ··· 945 945 kfree(b->legacy_io); 946 946 b->legacy_io = NULL; 947 947 kzalloc_err: 948 - printk(KERN_WARNING "pci: warning: could not create legacy I/O port " 949 - "and ISA memory resources to sysfs\n"); 948 + printk(KERN_WARNING "pci: warning: could not create legacy I/O port and ISA memory resources to sysfs\n"); 950 949 return; 951 950 } 952 951 ··· 1005 1006 return -ENODEV; 1006 1007 1007 1008 if (!pci_mmap_fits(pdev, i, vma, PCI_MMAP_SYSFS)) { 1008 - WARN(1, "process \"%s\" tried to map 0x%08lx bytes " 1009 - "at page 0x%08lx on %s BAR %d (start 0x%16Lx, size 0x%16Lx)\n", 1009 + WARN(1, "process \"%s\" tried to map 0x%08lx bytes at page 0x%08lx on %s BAR %d (start 0x%16Lx, size 0x%16Lx)\n", 1010 1010 current->comm, vma->vm_end-vma->vm_start, vma->vm_pgoff, 1011 1011 pci_name(pdev), i, 1012 1012 (u64)pci_resource_start(pdev, i),
+11 -12
drivers/pci/pci.c
··· 555 555 */ 556 556 if (state != PCI_D0 && dev->current_state <= PCI_D3cold 557 557 && dev->current_state > state) { 558 - dev_err(&dev->dev, "invalid power transition " 559 - "(from state %d to %d)\n", dev->current_state, state); 558 + dev_err(&dev->dev, "invalid power transition (from state %d to %d)\n", 559 + dev->current_state, state); 560 560 return -EINVAL; 561 561 } 562 562 ··· 603 603 pci_read_config_word(dev, dev->pm_cap + PCI_PM_CTRL, &pmcsr); 604 604 dev->current_state = (pmcsr & PCI_PM_CTRL_STATE_MASK); 605 605 if (dev->current_state != state && printk_ratelimit()) 606 - dev_info(&dev->dev, "Refused to change power state, " 607 - "currently in D%d\n", dev->current_state); 606 + dev_info(&dev->dev, "Refused to change power state, currently in D%d\n", 607 + dev->current_state); 608 608 609 609 /* 610 610 * According to section 5.4.1 of the "PCI BUS POWER MANAGEMENT ··· 1029 1029 return; 1030 1030 1031 1031 for (;;) { 1032 - dev_dbg(&pdev->dev, "restoring config space at offset " 1033 - "%#x (was %#x, writing %#x)\n", offset, val, saved_val); 1032 + dev_dbg(&pdev->dev, "restoring config space at offset %#x (was %#x, writing %#x)\n", 1033 + offset, val, saved_val); 1034 1034 pci_write_config_dword(pdev, offset, saved_val); 1035 1035 if (retry-- <= 0) 1036 1036 return; ··· 2815 2815 if (cacheline_size == pci_cache_line_size) 2816 2816 return 0; 2817 2817 2818 - dev_printk(KERN_DEBUG, &dev->dev, "cache line size of %d is not " 2819 - "supported\n", pci_cache_line_size << 2); 2818 + dev_printk(KERN_DEBUG, &dev->dev, "cache line size of %d is not supported\n", 2819 + pci_cache_line_size << 2); 2820 2820 2821 2821 return -EINVAL; 2822 2822 } ··· 2952 2952 * go ahead and check it. 2953 2953 */ 2954 2954 if ((new ^ orig) & ~PCI_COMMAND_INTX_DISABLE) { 2955 - dev_err(&dev->dev, "Command register changed from " 2956 - "0x%x to 0x%x: driver or hardware bug?\n", orig, new); 2955 + dev_err(&dev->dev, "Command register changed from 0x%x to 0x%x: driver or hardware bug?\n", 2956 + orig, new); 2957 2957 } else if ((new ^ orig) & PCI_COMMAND_INTX_DISABLE) { 2958 2958 mask_supported = true; 2959 2959 pci_write_config_word(dev, PCI_COMMAND, orig); ··· 3138 3138 if (pci_wait_for_pending(dev, PCI_AF_STATUS, PCI_AF_STATUS_TP)) 3139 3139 goto clear; 3140 3140 3141 - dev_err(&dev->dev, "transaction is not cleared; " 3142 - "proceeding with reset anyway\n"); 3141 + dev_err(&dev->dev, "transaction is not cleared; proceeding with reset anyway\n"); 3143 3142 3144 3143 clear: 3145 3144 pci_write_config_byte(dev, pos + PCI_AF_CTRL, PCI_AF_CTRL_FLR);
+2 -4
drivers/pci/pcie/aer/aer_inject.c
··· 397 397 if (!aer_mask_override && einj->cor_status && 398 398 !(einj->cor_status & ~cor_mask)) { 399 399 ret = -EINVAL; 400 - printk(KERN_WARNING "The correctable error(s) is masked " 401 - "by device\n"); 400 + printk(KERN_WARNING "The correctable error(s) is masked by device\n"); 402 401 spin_unlock_irqrestore(&inject_lock, flags); 403 402 goto out_put; 404 403 } 405 404 if (!aer_mask_override && einj->uncor_status && 406 405 !(einj->uncor_status & ~uncor_mask)) { 407 406 ret = -EINVAL; 408 - printk(KERN_WARNING "The uncorrectable error(s) is masked " 409 - "by device\n"); 407 + printk(KERN_WARNING "The uncorrectable error(s) is masked by device\n"); 410 408 spin_unlock_irqrestore(&inject_lock, flags); 411 409 goto out_put; 412 410 }
+3 -7
drivers/pci/pcie/aer/aerdrv_errprint.c
··· 172 172 int id = ((dev->bus->number << 8) | dev->devfn); 173 173 174 174 if (!info->status) { 175 - dev_err(&dev->dev, 176 - "PCIe Bus Error: severity=%s, type=Unaccessible, " 177 - "id=%04x(Unregistered Agent ID)\n", 175 + dev_err(&dev->dev, "PCIe Bus Error: severity=%s, type=Unaccessible, id=%04x(Unregistered Agent ID)\n", 178 176 aer_error_severity_string[info->severity], id); 179 177 goto out; 180 178 } ··· 180 182 layer = AER_GET_LAYER_ERROR(info->severity, info->status); 181 183 agent = AER_GET_AGENT(info->severity, info->status); 182 184 183 - dev_err(&dev->dev, 184 - "PCIe Bus Error: severity=%s, type=%s, id=%04x(%s)\n", 185 + dev_err(&dev->dev, "PCIe Bus Error: severity=%s, type=%s, id=%04x(%s)\n", 185 186 aer_error_severity_string[info->severity], 186 187 aer_error_layer[layer], id, aer_agent_string[agent]); 187 188 188 - dev_err(&dev->dev, 189 - " device [%04x:%04x] error status/mask=%08x/%08x\n", 189 + dev_err(&dev->dev, " device [%04x:%04x] error status/mask=%08x/%08x\n", 190 190 dev->vendor, dev->device, 191 191 info->status, info->mask); 192 192
+1 -2
drivers/pci/pcie/pme.c
··· 199 199 * assuming that the PME was reported by a PCIe-PCI bridge that 200 200 * used devfn different from zero. 201 201 */ 202 - dev_dbg(&port->dev, "PME interrupt generated for " 203 - "non-existent device %02x:%02x.%d\n", 202 + dev_dbg(&port->dev, "PME interrupt generated for non-existent device %02x:%02x.%d\n", 204 203 busnr, PCI_SLOT(devfn), PCI_FUNC(devfn)); 205 204 found = pcie_pme_from_pci_bridge(bus, 0); 206 205 }
+3 -3
drivers/pci/pcie/portdrv_pci.c
··· 204 204 return -ENODEV; 205 205 206 206 if (!dev->irq && dev->pin) { 207 - dev_warn(&dev->dev, "device [%04x:%04x] has invalid IRQ; " 208 - "check vendor BIOS\n", dev->vendor, dev->device); 207 + dev_warn(&dev->dev, "device [%04x:%04x] has invalid IRQ; check vendor BIOS\n", 208 + dev->vendor, dev->device); 209 209 } 210 210 status = pcie_port_device_register(dev); 211 211 if (status) ··· 397 397 static int __init dmi_pcie_pme_disable_msi(const struct dmi_system_id *d) 398 398 { 399 399 pr_notice("%s detected: will not use MSI for PCIe PME signaling\n", 400 - d->ident); 400 + d->ident); 401 401 pcie_pme_disable_msi(); 402 402 return 0; 403 403 }
+12 -17
drivers/pci/probe.c
··· 433 433 limit |= ((unsigned long) mem_limit_hi) << 32; 434 434 #else 435 435 if (mem_base_hi || mem_limit_hi) { 436 - dev_err(&dev->dev, "can't handle 64-bit " 437 - "address space for bridge\n"); 436 + dev_err(&dev->dev, "can't handle 64-bit address space for bridge\n"); 438 437 return; 439 438 } 440 439 #endif ··· 932 933 (child->number > bus->busn_res.end) || 933 934 (child->number < bus->number) || 934 935 (child->busn_res.end < bus->number)) { 935 - dev_info(&child->dev, "%pR %s " 936 - "hidden behind%s bridge %s %pR\n", 936 + dev_info(&child->dev, "%pR %s hidden behind%s bridge %s %pR\n", 937 937 &child->busn_res, 938 938 (bus->number > child->busn_res.end && 939 939 bus->busn_res.end < child->number) ? ··· 1222 1224 break; 1223 1225 1224 1226 default: /* unknown header */ 1225 - dev_err(&dev->dev, "unknown header type %02x, " 1226 - "ignoring device\n", dev->hdr_type); 1227 + dev_err(&dev->dev, "unknown header type %02x, ignoring device\n", 1228 + dev->hdr_type); 1227 1229 return -EIO; 1228 1230 1229 1231 bad: 1230 - dev_err(&dev->dev, "ignoring class %#08x (doesn't match header " 1231 - "type %02x)\n", dev->class, dev->hdr_type); 1232 + dev_err(&dev->dev, "ignoring class %#08x (doesn't match header type %02x)\n", 1233 + dev->class, dev->hdr_type); 1232 1234 dev->class = PCI_CLASS_NOT_DEFINED; 1233 1235 } 1234 1236 ··· 1303 1305 return false; 1304 1306 /* Card hasn't responded in 60 seconds? Must be stuck. */ 1305 1307 if (delay > crs_timeout) { 1306 - printk(KERN_WARNING "pci %04x:%02x:%02x.%d: not " 1307 - "responding\n", pci_domain_nr(bus), 1308 - bus->number, PCI_SLOT(devfn), 1309 - PCI_FUNC(devfn)); 1308 + printk(KERN_WARNING "pci %04x:%02x:%02x.%d: not responding\n", 1309 + pci_domain_nr(bus), bus->number, PCI_SLOT(devfn), 1310 + PCI_FUNC(devfn)); 1310 1311 return false; 1311 1312 } 1312 1313 } ··· 1610 1613 } 1611 1614 1612 1615 if (mrrs < 128) 1613 - dev_err(&dev->dev, "MRRS was unable to be configured with a " 1614 - "safe value. If problems are experienced, try running " 1615 - "with pci=pcie_bus_safe.\n"); 1616 + dev_err(&dev->dev, "MRRS was unable to be configured with a safe value. If problems are experienced, try running with pci=pcie_bus_safe\n"); 1616 1617 } 1617 1618 1618 1619 static void pcie_bus_detect_mps(struct pci_dev *dev) ··· 1647 1652 pcie_write_mps(dev, mps); 1648 1653 pcie_write_mrrs(dev); 1649 1654 1650 - dev_info(&dev->dev, "Max Payload Size set to %4d/%4d (was %4d), " 1651 - "Max Read Rq %4d\n", pcie_get_mps(dev), 128 << dev->pcie_mpss, 1655 + dev_info(&dev->dev, "Max Payload Size set to %4d/%4d (was %4d), Max Read Rq %4d\n", 1656 + pcie_get_mps(dev), 128 << dev->pcie_mpss, 1652 1657 orig_mps, pcie_get_readrq(dev)); 1653 1658 1654 1659 return 0;
+33 -46
drivers/pci/quirks.c
··· 315 315 if (pci_resource_len(dev, 0) != 8) { 316 316 struct resource *res = &dev->resource[0]; 317 317 res->end = res->start + 8 - 1; 318 - dev_info(&dev->dev, "CS5536 ISA bridge bug detected " 319 - "(incorrect header); workaround applied.\n"); 318 + dev_info(&dev->dev, "CS5536 ISA bridge bug detected (incorrect header); workaround applied\n"); 320 319 } 321 320 } 322 321 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CS5536_ISA, quirk_cs5536_vsa); ··· 399 400 * let's get enough confirmation reports first. 400 401 */ 401 402 base &= -size; 402 - dev_info(&dev->dev, "%s PIO at %04x-%04x\n", name, base, base + size - 1); 403 + dev_info(&dev->dev, "%s PIO at %04x-%04x\n", name, base, 404 + base + size - 1); 403 405 } 404 406 405 407 static void piix4_mem_quirk(struct pci_dev *dev, const char *name, unsigned int port, unsigned int enable) ··· 425 425 * reserve it, but let's get enough confirmation reports first. 426 426 */ 427 427 base &= -size; 428 - dev_info(&dev->dev, "%s MMIO at %04x-%04x\n", name, base, base + size - 1); 428 + dev_info(&dev->dev, "%s MMIO at %04x-%04x\n", name, base, 429 + base + size - 1); 429 430 } 430 431 431 432 /* ··· 669 668 struct pci_dev *pdev; 670 669 u16 command; 671 670 672 - dev_warn(&dev->dev, "TI XIO2000a quirk detected; " 673 - "secondary bus fast back-to-back transfers disabled\n"); 671 + dev_warn(&dev->dev, "TI XIO2000a quirk detected; secondary bus fast back-to-back transfers disabled\n"); 674 672 list_for_each_entry(pdev, &dev->subordinate->devices, bus_list) { 675 673 pci_read_config_word(pdev, PCI_COMMAND, &command); 676 674 if (command & PCI_COMMAND_FAST_BACK) ··· 761 761 static void quirk_amd_8131_mmrbc(struct pci_dev *dev) 762 762 { 763 763 if (dev->subordinate && dev->revision <= 0x12) { 764 - dev_info(&dev->dev, "AMD8131 rev %x detected; " 765 - "disabling PCI-X MMRBC\n", dev->revision); 764 + dev_info(&dev->dev, "AMD8131 rev %x detected; disabling PCI-X MMRBC\n", 765 + dev->revision); 766 766 dev->subordinate->bus_flags |= PCI_BUS_FLAGS_NO_MMRBC; 767 767 } 768 768 } ··· 971 971 pci_read_config_byte(dev, 0x41, &reg); 972 972 if (reg & 2) { 973 973 reg &= ~2; 974 - dev_info(&dev->dev, "Fixup for MediaGX/Geode Slave Disconnect Boundary (0x41=0x%02x)\n", reg); 974 + dev_info(&dev->dev, "Fixup for MediaGX/Geode Slave Disconnect Boundary (0x41=0x%02x)\n", 975 + reg); 975 976 pci_write_config_byte(dev, 0x41, reg); 976 977 } 977 978 } ··· 1263 1262 pci_write_config_word(dev, 0xF2, val & (~0x8)); 1264 1263 pci_read_config_word(dev, 0xF2, &val); 1265 1264 if (val & 0x8) 1266 - dev_info(&dev->dev, "i801 SMBus device continues to play 'hide and seek'! 0x%x\n", val); 1265 + dev_info(&dev->dev, "i801 SMBus device continues to play 'hide and seek'! 0x%x\n", 1266 + val); 1267 1267 else 1268 1268 dev_info(&dev->dev, "Enabled i801 SMBus device\n"); 1269 1269 } ··· 1412 1410 pci_write_config_byte(dev, 0x50, val & (~0xc0)); 1413 1411 pci_read_config_byte(dev, 0x50, &val); 1414 1412 if (val & 0xc0) 1415 - dev_info(&dev->dev, "Onboard AC97/MC97 devices continue to play 'hide and seek'! 0x%x\n", val); 1413 + dev_info(&dev->dev, "Onboard AC97/MC97 devices continue to play 'hide and seek'! 0x%x\n", 1414 + val); 1416 1415 else 1417 1416 dev_info(&dev->dev, "Enabled onboard AC97/MC97 devices\n"); 1418 1417 } ··· 1723 1720 1724 1721 pci_read_config_word(dev, AMD_8111_PCI_IRQ_ROUTING, &pci_config_word); 1725 1722 if (!pci_config_word) { 1726 - dev_info(&dev->dev, "boot interrupts on device [%04x:%04x] " 1727 - "already disabled\n", dev->vendor, dev->device); 1723 + dev_info(&dev->dev, "boot interrupts on device [%04x:%04x] already disabled\n", 1724 + dev->vendor, dev->device); 1728 1725 return; 1729 1726 } 1730 1727 pci_write_config_word(dev, AMD_8111_PCI_IRQ_ROUTING, 0); ··· 1772 1769 if (pci_resource_len(dev, bar) == 0x80 && 1773 1770 (pci_resource_start(dev, bar) & 0x80)) { 1774 1771 struct resource *r = &dev->resource[bar]; 1775 - dev_info(&dev->dev, 1776 - "Re-allocating PLX PCI 9050 BAR %u to length 256 to avoid bit 7 bug\n", 1772 + dev_info(&dev->dev, "Re-allocating PLX PCI 9050 BAR %u to length 256 to avoid bit 7 bug\n", 1777 1773 bar); 1778 1774 r->flags |= IORESOURCE_UNSET; 1779 1775 r->start = 0; ··· 1819 1817 case PCI_DEVICE_ID_NETMOS_9845: 1820 1818 case PCI_DEVICE_ID_NETMOS_9855: 1821 1819 if (num_parallel) { 1822 - dev_info(&dev->dev, "Netmos %04x (%u parallel, " 1823 - "%u serial); changing class SERIAL to OTHER " 1824 - "(use parport_serial)\n", 1820 + dev_info(&dev->dev, "Netmos %04x (%u parallel, %u serial); changing class SERIAL to OTHER (use parport_serial)\n", 1825 1821 dev->device, num_parallel, num_serial); 1826 1822 dev->class = (PCI_CLASS_COMMUNICATION_OTHER << 8) | 1827 1823 (dev->class & 0xff); ··· 1886 1886 1887 1887 cmd_hi = readb(csr + 3); 1888 1888 if (cmd_hi == 0) { 1889 - dev_warn(&dev->dev, "Firmware left e100 interrupts enabled; " 1890 - "disabling\n"); 1889 + dev_warn(&dev->dev, "Firmware left e100 interrupts enabled; disabling\n"); 1891 1890 writeb(1, csr + 3); 1892 1891 } 1893 1892 ··· 1956 1957 if (pci_read_config_byte(dev, 0xf41, &b) == 0) { 1957 1958 if (!(b & 0x20)) { 1958 1959 pci_write_config_byte(dev, 0xf41, b | 0x20); 1959 - dev_info(&dev->dev, 1960 - "Linking AER extended capability\n"); 1960 + dev_info(&dev->dev, "Linking AER extended capability\n"); 1961 1961 } 1962 1962 } 1963 1963 } ··· 1994 1996 /* Turn off PCI Bus Parking */ 1995 1997 pci_write_config_byte(dev, 0x76, b ^ 0x40); 1996 1998 1997 - dev_info(&dev->dev, 1998 - "Disabling VIA CX700 PCI parking\n"); 1999 + dev_info(&dev->dev, "Disabling VIA CX700 PCI parking\n"); 1999 2000 } 2000 2001 } 2001 2002 ··· 2009 2012 /* Disable "Read FIFO Timer" */ 2010 2013 pci_write_config_byte(dev, 0x77, 0x0); 2011 2014 2012 - dev_info(&dev->dev, 2013 - "Disabling VIA CX700 PCI caching\n"); 2015 + dev_info(&dev->dev, "Disabling VIA CX700 PCI caching\n"); 2014 2016 } 2015 2017 } 2016 2018 } ··· 2144 2148 static void quirk_disable_msi(struct pci_dev *dev) 2145 2149 { 2146 2150 if (dev->subordinate) { 2147 - dev_warn(&dev->dev, "MSI quirk detected; " 2148 - "subordinate MSI disabled\n"); 2151 + dev_warn(&dev->dev, "MSI quirk detected; subordinate MSI disabled\n"); 2149 2152 dev->subordinate->bus_flags |= PCI_BUS_FLAGS_NO_MSI; 2150 2153 } 2151 2154 } ··· 2200 2205 static void quirk_msi_ht_cap(struct pci_dev *dev) 2201 2206 { 2202 2207 if (dev->subordinate && !msi_ht_cap_enabled(dev)) { 2203 - dev_warn(&dev->dev, "MSI quirk detected; " 2204 - "subordinate MSI disabled\n"); 2208 + dev_warn(&dev->dev, "MSI quirk detected; subordinate MSI disabled\n"); 2205 2209 dev->subordinate->bus_flags |= PCI_BUS_FLAGS_NO_MSI; 2206 2210 } 2207 2211 } ··· 2224 2230 if (!pdev) 2225 2231 return; 2226 2232 if (!msi_ht_cap_enabled(dev) && !msi_ht_cap_enabled(pdev)) { 2227 - dev_warn(&dev->dev, "MSI quirk detected; " 2228 - "subordinate MSI disabled\n"); 2233 + dev_warn(&dev->dev, "MSI quirk detected; subordinate MSI disabled\n"); 2229 2234 dev->subordinate->bus_flags |= PCI_BUS_FLAGS_NO_MSI; 2230 2235 } 2231 2236 pci_dev_put(pdev); ··· 2270 2277 if (board_name && 2271 2278 (strstr(board_name, "P5N32-SLI PREMIUM") || 2272 2279 strstr(board_name, "P5N32-E SLI"))) { 2273 - dev_info(&dev->dev, 2274 - "Disabling msi for MCP55 NIC on P5N32-SLI\n"); 2280 + dev_info(&dev->dev, "Disabling msi for MCP55 NIC on P5N32-SLI\n"); 2275 2281 dev->no_msi = 1; 2276 2282 } 2277 2283 } ··· 2479 2487 */ 2480 2488 host_bridge = pci_get_bus_and_slot(0, PCI_DEVFN(0, 0)); 2481 2489 if (host_bridge == NULL) { 2482 - dev_warn(&dev->dev, 2483 - "nv_msi_ht_cap_quirk didn't locate host bridge\n"); 2490 + dev_warn(&dev->dev, "nv_msi_ht_cap_quirk didn't locate host bridge\n"); 2484 2491 return; 2485 2492 } 2486 2493 ··· 2806 2815 */ 2807 2816 err = pci_read_config_word(dev, 0x48, &rcc); 2808 2817 if (err) { 2809 - dev_err(&dev->dev, "Error attempting to read the read " 2810 - "completion coalescing register.\n"); 2818 + dev_err(&dev->dev, "Error attempting to read the read completion coalescing register\n"); 2811 2819 return; 2812 2820 } 2813 2821 ··· 2817 2827 2818 2828 err = pci_write_config_word(dev, 0x48, rcc); 2819 2829 if (err) { 2820 - dev_err(&dev->dev, "Error attempting to write the read " 2821 - "completion coalescing register.\n"); 2830 + dev_err(&dev->dev, "Error attempting to write the read completion coalescing register\n"); 2822 2831 return; 2823 2832 } 2824 2833 2825 - pr_info_once("Read completion coalescing disabled due to hardware " 2826 - "errata relating to 256B MPS.\n"); 2834 + pr_info_once("Read completion coalescing disabled due to hardware errata relating to 256B MPS\n"); 2827 2835 } 2828 2836 /* Intel 5000 series memory controllers and ports 2-7 */ 2829 2837 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x25c0, quirk_intel_mc_errata); ··· 2930 2942 2931 2943 /* Check if any interrupt line is still enabled */ 2932 2944 if (readl(regs + I915_DEIER_REG) != 0) { 2933 - dev_warn(&dev->dev, "BIOS left Intel GPU interrupts enabled; " 2934 - "disabling\n"); 2945 + dev_warn(&dev->dev, "BIOS left Intel GPU interrupts enabled; disabling\n"); 2935 2946 2936 2947 writel(0, regs + I915_DEIER_REG); 2937 2948 } ··· 3097 3110 if (!tmp || cls == tmp) 3098 3111 continue; 3099 3112 3100 - printk(KERN_DEBUG "PCI: CLS mismatch (%u != %u), " 3101 - "using %u bytes\n", cls << 2, tmp << 2, 3113 + printk(KERN_DEBUG "PCI: CLS mismatch (%u != %u), using %u bytes\n", 3114 + cls << 2, tmp << 2, 3102 3115 pci_dfl_cache_line_size << 2); 3103 3116 pci_cache_line_size = pci_dfl_cache_line_size; 3104 3117 }
+17 -22
drivers/pci/setup-bus.c
··· 148 148 149 149 tmp = kzalloc(sizeof(*tmp), GFP_KERNEL); 150 150 if (!tmp) 151 - panic("pdev_sort_resources(): " 152 - "kmalloc() failed!\n"); 151 + panic("pdev_sort_resources(): kmalloc() failed!\n"); 153 152 tmp->res = r; 154 153 tmp->dev = dev; 155 154 ··· 858 859 resource_size(b_res), min_align); 859 860 if (!size0 && !size1) { 860 861 if (b_res->start || b_res->end) 861 - dev_info(&bus->self->dev, "disabling bridge window " 862 - "%pR to %pR (unused)\n", b_res, 863 - &bus->busn_res); 862 + dev_info(&bus->self->dev, "disabling bridge window %pR to %pR (unused)\n", 863 + b_res, &bus->busn_res); 864 864 b_res->flags = 0; 865 865 return; 866 866 } ··· 870 872 if (size1 > size0 && realloc_head) { 871 873 add_to_list(realloc_head, bus->self, b_res, size1-size0, 872 874 min_align); 873 - dev_printk(KERN_DEBUG, &bus->self->dev, "bridge window " 874 - "%pR to %pR add_size %llx\n", b_res, 875 - &bus->busn_res, 876 - (unsigned long long)size1-size0); 875 + dev_printk(KERN_DEBUG, &bus->self->dev, "bridge window %pR to %pR add_size %llx\n", 876 + b_res, &bus->busn_res, 877 + (unsigned long long)size1-size0); 877 878 } 878 879 } 879 880 ··· 971 974 if (order < 0) 972 975 order = 0; 973 976 if (order >= ARRAY_SIZE(aligns)) { 974 - dev_warn(&dev->dev, "disabling BAR %d: %pR " 975 - "(bad alignment %#llx)\n", i, r, 976 - (unsigned long long) align); 977 + dev_warn(&dev->dev, "disabling BAR %d: %pR (bad alignment %#llx)\n", 978 + i, r, (unsigned long long) align); 977 979 r->flags = 0; 978 980 continue; 979 981 } ··· 999 1003 resource_size(b_res), min_align); 1000 1004 if (!size0 && !size1) { 1001 1005 if (b_res->start || b_res->end) 1002 - dev_info(&bus->self->dev, "disabling bridge window " 1003 - "%pR to %pR (unused)\n", b_res, 1004 - &bus->busn_res); 1006 + dev_info(&bus->self->dev, "disabling bridge window %pR to %pR (unused)\n", 1007 + b_res, &bus->busn_res); 1005 1008 b_res->flags = 0; 1006 1009 return 0; 1007 1010 } ··· 1009 1014 b_res->flags |= IORESOURCE_STARTALIGN; 1010 1015 if (size1 > size0 && realloc_head) { 1011 1016 add_to_list(realloc_head, bus->self, b_res, size1-size0, min_align); 1012 - dev_printk(KERN_DEBUG, &bus->self->dev, "bridge window " 1013 - "%pR to %pR add_size %llx\n", b_res, 1014 - &bus->busn_res, (unsigned long long)size1-size0); 1017 + dev_printk(KERN_DEBUG, &bus->self->dev, "bridge window %pR to %pR add_size %llx\n", 1018 + b_res, &bus->busn_res, 1019 + (unsigned long long)size1-size0); 1015 1020 } 1016 1021 return 0; 1017 1022 } ··· 1269 1274 break; 1270 1275 1271 1276 default: 1272 - dev_info(&dev->dev, "not setting up bridge for bus " 1273 - "%04x:%02x\n", pci_domain_nr(b), b->number); 1277 + dev_info(&dev->dev, "not setting up bridge for bus %04x:%02x\n", 1278 + pci_domain_nr(b), b->number); 1274 1279 break; 1275 1280 } 1276 1281 } ··· 1307 1312 break; 1308 1313 1309 1314 default: 1310 - dev_info(&bridge->dev, "not setting up bridge for bus " 1311 - "%04x:%02x\n", pci_domain_nr(b), b->number); 1315 + dev_info(&bridge->dev, "not setting up bridge for bus %04x:%02x\n", 1316 + pci_domain_nr(b), b->number); 1312 1317 break; 1313 1318 } 1314 1319 }
+6 -6
drivers/pci/setup-res.c
··· 96 96 pci_write_config_dword(dev, reg + 4, new); 97 97 pci_read_config_dword(dev, reg + 4, &check); 98 98 if (check != new) { 99 - dev_err(&dev->dev, "BAR %d: error updating " 100 - "(high %#08x != %#08x)\n", resno, new, check); 99 + dev_err(&dev->dev, "BAR %d: error updating (high %#08x != %#08x)\n", 100 + resno, new, check); 101 101 } 102 102 } 103 103 ··· 289 289 res->flags |= IORESOURCE_UNSET; 290 290 align = pci_resource_alignment(dev, res); 291 291 if (!align) { 292 - dev_info(&dev->dev, "BAR %d: can't assign %pR " 293 - "(bogus alignment)\n", resno, res); 292 + dev_info(&dev->dev, "BAR %d: can't assign %pR (bogus alignment)\n", 293 + resno, res); 294 294 return -EINVAL; 295 295 } 296 296 ··· 325 325 326 326 res->flags |= IORESOURCE_UNSET; 327 327 if (!res->parent) { 328 - dev_info(&dev->dev, "BAR %d: can't reassign an unassigned resource %pR " 329 - "\n", resno, res); 328 + dev_info(&dev->dev, "BAR %d: can't reassign an unassigned resource %pR\n", 329 + resno, res); 330 330 return -EINVAL; 331 331 } 332 332