PNP: use dev_printk when possible

Use dev_printk() when possible for more informative error messages.

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Acked-By: Rene Herman <rene.herman@gmail.com>
Signed-off-by: Len Brown <len.brown@intel.com>

diff --git a/drivers/pnp/isapnp/core.c b/drivers/pnp/isapnp/core.c
index 6f1007548c93c6b93ea73e86f2b08a6ce467fde7..990d8cd6295c122a8af2d6c1f9be4110e37caf54 100644 (file)
--- a/drivers/pnp/isapnp/core.c
+++ b/drivers/pnp/isapnp/core.c
@@ -737,9 +737,8 @@ static int __init isapnp_create_device(struct pnp_card *card,
                                isapnp_skip_bytes(size);
                        return 1;
                default:
-                       printk(KERN_ERR
-                              "isapnp: unexpected or unknown tag type 0x%x for logical device %i (device %i), ignored\n",
-                              type, dev->number, card->number);
+                       dev_err(&dev->dev, "unknown tag %#x (card %i), "
+                               "ignored\n", type, card->number);
                }
 __skip:
                if (size > 0)
@@ -792,9 +791,8 @@ static void __init isapnp_parse_resource_map(struct pnp_card *card)
                                isapnp_skip_bytes(size);
                        return;
                default:
-                       printk(KERN_ERR
-                              "isapnp: unexpected or unknown tag type 0x%x for device %i, ignored\n",
-                              type, card->number);
+                       dev_err(&card->dev, "unknown tag %#x, ignored\n",
+                              type);
                }
 __skip:
                if (size > 0)
@@ -841,13 +839,6 @@ static int __init isapnp_build_device_list(void)
                isapnp_wake(csn);
                isapnp_peek(header, 9);
                checksum = isapnp_checksum(header);
-#if 0
-               printk(KERN_DEBUG
-                      "vendor: %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n",
-                      header[0], header[1], header[2], header[3], header[4],
-                      header[5], header[6], header[7], header[8]);
-               printk(KERN_DEBUG "checksum = 0x%x\n", checksum);
-#endif
                eisa_id = header[0] | header[1] << 8 |
                          header[2] << 16 | header[3] << 24;
                pnp_eisa_id_to_string(eisa_id, id);
@@ -855,6 +846,13 @@ static int __init isapnp_build_device_list(void)
                if (!card)
                        continue;
 
+#if 0
+               dev_info(&card->dev,
+                      "vendor: %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n",
+                      header[0], header[1], header[2], header[3], header[4],
+                      header[5], header[6], header[7], header[8]);
+               dev_info(&card->dev, "checksum = %#x\n", checksum);
+#endif
                INIT_LIST_HEAD(&card->devices);
                card->serial =
                    (header[7] << 24) | (header[6] << 16) | (header[5] << 8) |
@@ -862,9 +860,8 @@ static int __init isapnp_build_device_list(void)
                isapnp_checksum_value = 0x00;
                isapnp_parse_resource_map(card);
                if (isapnp_checksum_value != 0x00)
-                       printk(KERN_ERR
-                              "isapnp: checksum for device %i is not valid (0x%x)\n",
-                              csn, isapnp_checksum_value);
+                       dev_err(&card->dev, "invalid checksum %#x\n",
+                               isapnp_checksum_value);
                card->checksum = isapnp_checksum_value;
 
                pnp_add_card(card);
@@ -1134,13 +1131,13 @@ static int __init isapnp_init(void)
        protocol_for_each_card(&isapnp_protocol, card) {
                cards++;
                if (isapnp_verbose) {
-                       printk(KERN_INFO "isapnp: Card '%s'\n",
-                              card->name[0] ? card->name : "Unknown");
+                       dev_info(&card->dev, "card '%s'\n",
+                              card->name[0] ? card->name : "unknown");
                        if (isapnp_verbose < 2)
                                continue;
                        card_for_each_dev(card, dev) {
-                               printk(KERN_INFO "isapnp:   Device '%s'\n",
-                                      dev->name[0] ? dev->name : "Unknown");
+                               dev_info(&card->dev, "device '%s'\n",
+                                      dev->name[0] ? dev->name : "unknown");
                        }
                }
        }

diff --git a/drivers/pnp/pnpacpi/rsparser.c b/drivers/pnp/pnpacpi/rsparser.c
index 33dbf3644f2b49ed75b8e67b451f14eb5a92eb00..bd41e4d4270c86b59615867cc032074948063b5f 100644 (file)
--- a/drivers/pnp/pnpacpi/rsparser.c
+++ b/drivers/pnp/pnpacpi/rsparser.c
@@ -110,7 +110,7 @@ static void pnpacpi_parse_allocated_irqresource(struct pnp_dev *dev,
                p = p ? ACPI_ACTIVE_LOW : ACPI_ACTIVE_HIGH;
 
                if (triggering != t || polarity != p) {
-                       pnp_warn("IRQ %d override to %s, %s",
+                       dev_warn(&dev->dev, "IRQ %d override to %s, %s\n",
                                gsi, t ? "edge":"level", p ? "low":"high");
                        triggering = t;
                        polarity = p;
@@ -263,7 +263,7 @@ static void pnpacpi_parse_allocated_address_space(struct pnp_dev *dev,
 
        status = acpi_resource_to_address64(res, p);
        if (!ACPI_SUCCESS(status)) {
-               pnp_warn("PnPACPI: failed to convert resource type %d",
+               dev_warn(&dev->dev, "failed to convert resource type %d\n",
                         res->type);
                return;
        }
@@ -397,7 +397,8 @@ static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
                break;
 
        default:
-               pnp_warn("PnPACPI: unknown resource type %d", res->type);
+               dev_warn(&dev->dev, "unknown resource type %d in _CRS\n",
+                        res->type);
                return AE_ERROR;
        }
 
@@ -674,7 +675,8 @@ static __init acpi_status pnpacpi_option_resource(struct acpi_resource *res,
        case ACPI_RESOURCE_TYPE_END_DEPENDENT:
                /*only one EndDependentFn is allowed */
                if (!parse_data->option_independent) {
-                       pnp_warn("PnPACPI: more than one EndDependentFn");
+                       dev_warn(&dev->dev, "more than one EndDependentFn "
+                                "in _PRS\n");
                        return AE_ERROR;
                }
                parse_data->option = parse_data->option_independent;
@@ -726,7 +728,8 @@ static __init acpi_status pnpacpi_option_resource(struct acpi_resource *res,
                break;
 
        default:
-               pnp_warn("PnPACPI: unknown resource type %d", res->type);
+               dev_warn(&dev->dev, "unknown resource type %d in _PRS\n",
+                        res->type);
                return AE_ERROR;
        }
 
@@ -808,7 +811,7 @@ int pnpacpi_build_resource_template(struct pnp_dev *dev,
        status = acpi_walk_resources(handle, METHOD_NAME__CRS,
                                     pnpacpi_count_resources, &res_cnt);
        if (ACPI_FAILURE(status)) {
-               pnp_err("Evaluate _CRS failed");
+               dev_err(&dev->dev, "can't evaluate _CRS\n");
                return -EINVAL;
        }
        if (!res_cnt)
@@ -823,7 +826,7 @@ int pnpacpi_build_resource_template(struct pnp_dev *dev,
                                     pnpacpi_type_resources, &resource);
        if (ACPI_FAILURE(status)) {
                kfree(buffer->pointer);
-               pnp_err("Evaluate _CRS failed");
+               dev_err(&dev->dev, "can't evaluate _CRS\n");
                return -EINVAL;
        }
        /* resource will pointer the end resource now */
@@ -1074,7 +1077,8 @@ int pnpacpi_encode_resources(struct pnp_dev *dev, struct acpi_buffer *buffer)
                case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64:
                case ACPI_RESOURCE_TYPE_GENERIC_REGISTER:
                default:        /* other type */
-                       pnp_warn("unknown resource type %d", resource->type);
+                       dev_warn(&dev->dev, "can't encode unknown resource "
+                                "type %d\n", resource->type);
                        return -EINVAL;
                }
                resource++;

diff --git a/drivers/pnp/pnpbios/rsparser.c b/drivers/pnp/pnpbios/rsparser.c
index e90a3d4360b2f631220264c72e4841de14b56222..4390e3b41df07949f45f3f8823b975a14e3db537 100644 (file)
--- a/drivers/pnp/pnpbios/rsparser.c
+++ b/drivers/pnp/pnpbios/rsparser.c
@@ -241,9 +241,8 @@ static unsigned char *pnpbios_parse_allocated_resource_data(struct pnp_dev *dev,
 
                default:        /* an unkown tag */
 len_err:
-                       printk(KERN_ERR
-                              "PnPBIOS: Unknown tag '0x%x', length '%d'.\n",
-                              tag, len);
+                       dev_err(&dev->dev, "unknown tag %#x length %d\n",
+                               tag, len);
                        break;
                }
 
@@ -254,8 +253,7 @@ len_err:
                        p += len + 1;
        }
 
-       printk(KERN_ERR
-              "PnPBIOS: Resource structure does not contain an end tag.\n");
+       dev_err(&dev->dev, "no end tag in resource structure\n");
 
        return NULL;
 }
@@ -471,8 +469,8 @@ pnpbios_parse_resource_option_data(unsigned char *p, unsigned char *end,
                        if (len != 0)
                                goto len_err;
                        if (option_independent == option)
-                               printk(KERN_WARNING
-                                      "PnPBIOS: Missing SMALL_TAG_STARTDEP tag\n");
+                               dev_warn(&dev->dev, "missing "
+                                        "SMALL_TAG_STARTDEP tag\n");
                        option = option_independent;
                        dev_dbg(&dev->dev, "end dependent options\n");
                        break;
@@ -482,9 +480,8 @@ pnpbios_parse_resource_option_data(unsigned char *p, unsigned char *end,
 
                default:        /* an unkown tag */
 len_err:
-                       printk(KERN_ERR
-                              "PnPBIOS: Unknown tag '0x%x', length '%d'.\n",
-                              tag, len);
+                       dev_err(&dev->dev, "unknown tag %#x length %d\n",
+                               tag, len);
                        break;
                }
 
@@ -495,8 +492,7 @@ len_err:
                        p += len + 1;
        }
 
-       printk(KERN_ERR
-              "PnPBIOS: Resource structure does not contain an end tag.\n");
+       dev_err(&dev->dev, "no end tag in resource structure\n");
 
        return NULL;
 }
@@ -554,9 +550,8 @@ static unsigned char *pnpbios_parse_compatible_ids(unsigned char *p,
 
                default:        /* an unkown tag */
 len_err:
-                       printk(KERN_ERR
-                              "PnPBIOS: Unknown tag '0x%x', length '%d'.\n",
-                              tag, len);
+                       dev_err(&dev->dev, "unknown tag %#x length %d\n",
+                               tag, len);
                        break;
                }
 
@@ -567,8 +562,7 @@ len_err:
                        p += len + 1;
        }
 
-       printk(KERN_ERR
-              "PnPBIOS: Resource structure does not contain an end tag.\n");
+       dev_err(&dev->dev, "no end tag in resource structure\n");
 
        return NULL;
 }
@@ -774,9 +768,8 @@ static unsigned char *pnpbios_encode_allocated_resource_data(struct pnp_dev
 
                default:        /* an unkown tag */
 len_err:
-                       printk(KERN_ERR
-                              "PnPBIOS: Unknown tag '0x%x', length '%d'.\n",
-                              tag, len);
+                       dev_err(&dev->dev, "unknown tag %#x length %d\n",
+                               tag, len);
                        break;
                }
 
@@ -787,8 +780,7 @@ len_err:
                        p += len + 1;
        }
 
-       printk(KERN_ERR
-              "PnPBIOS: Resource structure does not contain an end tag.\n");
+       dev_err(&dev->dev, "no end tag in resource structure\n");
 
        return NULL;
 }