mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-12-28 10:15:32 -05:00
Merge branch 'pci/hotplug'
- Clean up whitespace in messages (Colin Ian King) * pci/hotplug: PCI: hotplug: Clean up spaces in messages
This commit is contained in:
@@ -1302,7 +1302,7 @@ int cpqhp_find_available_resources(struct controller *ctrl, void __iomem *rom_st
|
||||
|
||||
dbg("found io_node(base, length) = %x, %x\n",
|
||||
io_node->base, io_node->length);
|
||||
dbg("populated slot =%d \n", populated_slot);
|
||||
dbg("populated slot = %d\n", populated_slot);
|
||||
if (!populated_slot) {
|
||||
io_node->next = ctrl->io_head;
|
||||
ctrl->io_head = io_node;
|
||||
@@ -1325,7 +1325,7 @@ int cpqhp_find_available_resources(struct controller *ctrl, void __iomem *rom_st
|
||||
|
||||
dbg("found mem_node(base, length) = %x, %x\n",
|
||||
mem_node->base, mem_node->length);
|
||||
dbg("populated slot =%d \n", populated_slot);
|
||||
dbg("populated slot = %d\n", populated_slot);
|
||||
if (!populated_slot) {
|
||||
mem_node->next = ctrl->mem_head;
|
||||
ctrl->mem_head = mem_node;
|
||||
@@ -1349,7 +1349,7 @@ int cpqhp_find_available_resources(struct controller *ctrl, void __iomem *rom_st
|
||||
p_mem_node->length = pre_mem_length << 16;
|
||||
dbg("found p_mem_node(base, length) = %x, %x\n",
|
||||
p_mem_node->base, p_mem_node->length);
|
||||
dbg("populated slot =%d \n", populated_slot);
|
||||
dbg("populated slot = %d\n", populated_slot);
|
||||
|
||||
if (!populated_slot) {
|
||||
p_mem_node->next = ctrl->p_mem_head;
|
||||
@@ -1373,7 +1373,7 @@ int cpqhp_find_available_resources(struct controller *ctrl, void __iomem *rom_st
|
||||
bus_node->length = max_bus - secondary_bus + 1;
|
||||
dbg("found bus_node(base, length) = %x, %x\n",
|
||||
bus_node->base, bus_node->length);
|
||||
dbg("populated slot =%d \n", populated_slot);
|
||||
dbg("populated slot = %d\n", populated_slot);
|
||||
if (!populated_slot) {
|
||||
bus_node->next = ctrl->bus_head;
|
||||
ctrl->bus_head = bus_node;
|
||||
|
||||
@@ -124,7 +124,7 @@ static u8 i2c_ctrl_read(struct controller *ctlr_ptr, void __iomem *WPGBbar, u8 i
|
||||
unsigned long ultemp;
|
||||
unsigned long data; // actual data HILO format
|
||||
|
||||
debug_polling("%s - Entry WPGBbar[%p] index[%x] \n", __func__, WPGBbar, index);
|
||||
debug_polling("%s - Entry WPGBbar[%p] index[%x]\n", __func__, WPGBbar, index);
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
// READ - step 1
|
||||
@@ -147,7 +147,7 @@ static u8 i2c_ctrl_read(struct controller *ctlr_ptr, void __iomem *WPGBbar, u8 i
|
||||
ultemp = ultemp << 8;
|
||||
data |= ultemp;
|
||||
} else {
|
||||
err("this controller type is not supported \n");
|
||||
err("this controller type is not supported\n");
|
||||
return HPC_ERROR;
|
||||
}
|
||||
|
||||
@@ -258,7 +258,7 @@ static u8 i2c_ctrl_write(struct controller *ctlr_ptr, void __iomem *WPGBbar, u8
|
||||
ultemp = ultemp << 8;
|
||||
data |= ultemp;
|
||||
} else {
|
||||
err("this controller type is not supported \n");
|
||||
err("this controller type is not supported\n");
|
||||
return HPC_ERROR;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user