From b47f48e8b05ee0cdb15088392c1e9ede86d6d07d Mon Sep 17 00:00:00 2001 From: Marc Dietrich Date: Tue, 27 Sep 2011 19:00:41 +0200 Subject: [PATCH] --- yaml --- r: 268558 b: refs/heads/master c: a3a9aa1a41429b17aa1af20995850ea1b68d5ba2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/staging/nvec/nvec.c | 20 +++++++------------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/[refs] b/[refs] index f0788598c384..426c9a5f3873 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 162c7d8c4be2d599583c42c2a8fe99bed6d87f67 +refs/heads/master: a3a9aa1a41429b17aa1af20995850ea1b68d5ba2 diff --git a/trunk/drivers/staging/nvec/nvec.c b/trunk/drivers/staging/nvec/nvec.c index d8609abcbd26..d43fba25c22d 100644 --- a/trunk/drivers/staging/nvec/nvec.c +++ b/trunk/drivers/staging/nvec/nvec.c @@ -76,15 +76,13 @@ static int nvec_status_notifier(struct notifier_block *nb, unsigned long event_type, void *data) { unsigned char *msg = (unsigned char *)data; - int i; if (event_type != NVEC_CNTL) return NOTIFY_DONE; - printk(KERN_WARNING "unhandled msg type %ld, payload: ", event_type); - for (i = 0; i < msg[1]; i++) - printk("%0x ", msg[i+2]); - printk("\n"); + printk(KERN_WARNING "unhandled msg type %ld\n", event_type); + print_hex_dump(KERN_WARNING, "payload: ", DUMP_PREFIX_NONE, 16, 1, + msg, msg[1] + 2, true); return NOTIFY_OK; } @@ -117,20 +115,16 @@ static void nvec_request_master(struct work_struct *work) static int parse_msg(struct nvec_chip *nvec, struct nvec_msg *msg) { - int i; - if ((msg->data[0] & 1 << 7) == 0 && msg->data[3]) { dev_err(nvec->dev, "ec responded %02x %02x %02x %02x\n", msg->data[0], msg->data[1], msg->data[2], msg->data[3]); return -EINVAL; } - if ((msg->data[0] >> 7) == 1 && (msg->data[0] & 0x0f) == 5) { - dev_warn(nvec->dev, "ec system event "); - for (i = 0; i < msg->data[1]; i++) - dev_warn(nvec->dev, "%02x ", msg->data[2+i]); - dev_warn(nvec->dev, "\n"); - } + if ((msg->data[0] >> 7) == 1 && (msg->data[0] & 0x0f) == 5) + print_hex_dump(KERN_WARNING, "ec system event ", + DUMP_PREFIX_NONE, 16, 1, msg->data, + msg->data[1] + 2, true); atomic_notifier_call_chain(&nvec->notifier_list, msg->data[0] & 0x8f, msg->data);