diff options
author | Taku Izumi <izumi.taku@jp.fujitsu.com> | 2008-10-22 22:47:32 -0400 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-10-23 17:47:39 -0400 |
commit | 18b341b76cd99ce949806ccf5565900465ec2e7f (patch) | |
tree | b0c0985a190827df929f583bd7bc164ca4020d9c /drivers/pci/hotplug/pciehp_pci.c | |
parent | 8113587c2d14d3be2414190845b2e2617c0aa33b (diff) |
PCI hotplug: pciehp: message refinement
This patch refines messages in pciehp module. The main changes are as
follows:
- remove the trailing "."
- remove __func__ as much as possible
- capitalize the first letter of messages
- show PCI device address including its domain
Signed-off-by: Taku Izumi <izumi.taku@jp.fujitsu.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci/hotplug/pciehp_pci.c')
-rw-r--r-- | drivers/pci/hotplug/pciehp_pci.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/drivers/pci/hotplug/pciehp_pci.c b/drivers/pci/hotplug/pciehp_pci.c index ffd11148fbe2..10f9566cceeb 100644 --- a/drivers/pci/hotplug/pciehp_pci.c +++ b/drivers/pci/hotplug/pciehp_pci.c | |||
@@ -39,8 +39,7 @@ static void program_hpp_type0(struct pci_dev *dev, struct hpp_type0 *hpp) | |||
39 | u16 pci_cmd, pci_bctl; | 39 | u16 pci_cmd, pci_bctl; |
40 | 40 | ||
41 | if (hpp->revision > 1) { | 41 | if (hpp->revision > 1) { |
42 | printk(KERN_WARNING "%s: Rev.%d type0 record not supported\n", | 42 | warn("Rev.%d type0 record not supported\n", hpp->revision); |
43 | __func__, hpp->revision); | ||
44 | return; | 43 | return; |
45 | } | 44 | } |
46 | 45 | ||
@@ -81,8 +80,7 @@ static void program_hpp_type2(struct pci_dev *dev, struct hpp_type2 *hpp) | |||
81 | u32 reg32; | 80 | u32 reg32; |
82 | 81 | ||
83 | if (hpp->revision > 1) { | 82 | if (hpp->revision > 1) { |
84 | printk(KERN_WARNING "%s: Rev.%d type2 record not supported\n", | 83 | warn("Rev.%d type2 record not supported\n", hpp->revision); |
85 | __func__, hpp->revision); | ||
86 | return; | 84 | return; |
87 | } | 85 | } |
88 | 86 | ||
@@ -149,8 +147,7 @@ static void program_fw_provided_values(struct pci_dev *dev) | |||
149 | return; | 147 | return; |
150 | 148 | ||
151 | if (pciehp_get_hp_params_from_firmware(dev, &hpp)) { | 149 | if (pciehp_get_hp_params_from_firmware(dev, &hpp)) { |
152 | printk(KERN_WARNING "%s: Could not get hotplug parameters\n", | 150 | warn("Could not get hotplug parameters\n"); |
153 | __func__); | ||
154 | return; | 151 | return; |
155 | } | 152 | } |
156 | 153 | ||
@@ -202,9 +199,9 @@ int pciehp_configure_device(struct slot *p_slot) | |||
202 | 199 | ||
203 | dev = pci_get_slot(parent, PCI_DEVFN(p_slot->device, 0)); | 200 | dev = pci_get_slot(parent, PCI_DEVFN(p_slot->device, 0)); |
204 | if (dev) { | 201 | if (dev) { |
205 | ctrl_err(ctrl, | 202 | ctrl_err(ctrl, "Device %s already exists " |
206 | "Device %s already exists at %x:%x, cannot hot-add\n", | 203 | "at %04x:%02x:%02x, cannot hot-add\n", pci_name(dev), |
207 | pci_name(dev), p_slot->bus, p_slot->device); | 204 | pci_domain_nr(parent), p_slot->bus, p_slot->device); |
208 | pci_dev_put(dev); | 205 | pci_dev_put(dev); |
209 | return -EINVAL; | 206 | return -EINVAL; |
210 | } | 207 | } |
@@ -248,8 +245,8 @@ int pciehp_unconfigure_device(struct slot *p_slot) | |||
248 | u16 command; | 245 | u16 command; |
249 | struct controller *ctrl = p_slot->ctrl; | 246 | struct controller *ctrl = p_slot->ctrl; |
250 | 247 | ||
251 | ctrl_dbg(ctrl, "%s: bus/dev = %x/%x\n", __func__, | 248 | ctrl_dbg(ctrl, "%s: domain:bus:dev = %04x:%02x:%02x\n", |
252 | p_slot->bus, p_slot->device); | 249 | __func__, pci_domain_nr(parent), p_slot->bus, p_slot->device); |
253 | ret = p_slot->hpc_ops->get_adapter_status(p_slot, &presence); | 250 | ret = p_slot->hpc_ops->get_adapter_status(p_slot, &presence); |
254 | if (ret) | 251 | if (ret) |
255 | presence = 0; | 252 | presence = 0; |