From patchwork Tue Jun 5 08:26:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 9111 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 8989423E56 for ; Tue, 5 Jun 2012 08:38:04 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id 375B7A1899A for ; Tue, 5 Jun 2012 08:38:04 +0000 (UTC) Received: by yenq6 with SMTP id q6so4217242yen.11 for ; Tue, 05 Jun 2012 01:38:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:x-gm-message-state; bh=cwwxTpZSc5pl5SAdMbBUepjYeuuflmP8BUQNjBLv88w=; b=BK8H5rdRenCwIL5Cb1u9lTd5S8TymRCfnfFBKzzs/m2CRoE4CXyva5N7Ciu8wmcVxC hKxDn39o7BuY7D0hdk78T27J9qAz0o/8e14ZZqaarbkNhSaPLhAgBj+c8svZG247XTu/ u7rjYHhg+PER89RVd/3xRl/qAxttbkbJSpPtQuNp0KPcbwiTPbcZTX9W9cq4iCE98cXv VMUsxza9VlYcMpfLynQsEBLBCJY3tbw0cWUr6FXWpjVGbrzauD8z4itCrBb9EkKM3sFv EquBt1O7nur2m9oKWBk6sbswVEX+CCE5DeQpuyIHQekQPOj6AM9dqxoKXET+2PkXXOcV OLwg== Received: by 10.50.46.232 with SMTP id y8mr1309106igm.57.1338885483449; Tue, 05 Jun 2012 01:38:03 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.24.148 with SMTP id v20csp12326ibb; Tue, 5 Jun 2012 01:38:02 -0700 (PDT) Received: by 10.68.217.166 with SMTP id oz6mr1884159pbc.136.1338885481791; Tue, 05 Jun 2012 01:38:01 -0700 (PDT) Received: from mail-pb0-f50.google.com (mail-pb0-f50.google.com [209.85.160.50]) by mx.google.com with ESMTPS id hc10si1538921pbc.31.2012.06.05.01.38.01 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 05 Jun 2012 01:38:01 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.160.50 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=209.85.160.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.160.50 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) smtp.mail=sachin.kamat@linaro.org Received: by pbbrr4 with SMTP id rr4so8405935pbb.37 for ; Tue, 05 Jun 2012 01:38:01 -0700 (PDT) Received: by 10.68.219.199 with SMTP id pq7mr47888653pbc.93.1338885481266; Tue, 05 Jun 2012 01:38:01 -0700 (PDT) Received: from localhost.localdomain ([115.113.119.130]) by mx.google.com with ESMTPS id qp3sm1663091pbc.17.2012.06.05.01.37.57 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 05 Jun 2012 01:38:00 -0700 (PDT) From: Sachin Kamat To: devel@driverdev.osuosl.org Cc: gregkh@linuxfoundation.org, john.stultz@linaro.org, swetland@google.com, arve@android.com, sachin.kamat@linaro.org, patches@linaro.org Subject: [PATCH 1/2] staging: Android: Fix some checkpatch warnings Date: Tue, 5 Jun 2012 13:56:43 +0530 Message-Id: <1338884804-7427-1-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.4.1 X-Gm-Message-State: ALoCoQkEp6nXBuwrppIlRP9rfZZLYCAO4QTUTcCG6lo3ZSQpOJYccJwGP12+nNHNTzIhgjzUaBsU Warnings reported by checkpatch.pl have been fixed. Cc: Brian Swetland Signed-off-by: Sachin Kamat --- drivers/staging/android/ashmem.c | 12 ++++++------ drivers/staging/android/logger.c | 8 ++++---- drivers/staging/android/ram_console.c | 2 +- drivers/staging/android/timed_output.c | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/staging/android/ashmem.c b/drivers/staging/android/ashmem.c index e84dbec..01e61c9 100644 --- a/drivers/staging/android/ashmem.c +++ b/drivers/staging/android/ashmem.c @@ -707,7 +707,7 @@ static int __init ashmem_init(void) sizeof(struct ashmem_area), 0, 0, NULL); if (unlikely(!ashmem_area_cachep)) { - printk(KERN_ERR "ashmem: failed to create slab cache\n"); + pr_err("ashmem: failed to create slab cache\n"); return -ENOMEM; } @@ -715,19 +715,19 @@ static int __init ashmem_init(void) sizeof(struct ashmem_range), 0, 0, NULL); if (unlikely(!ashmem_range_cachep)) { - printk(KERN_ERR "ashmem: failed to create slab cache\n"); + pr_err("ashmem: failed to create slab cache\n"); return -ENOMEM; } ret = misc_register(&ashmem_misc); if (unlikely(ret)) { - printk(KERN_ERR "ashmem: failed to register misc device!\n"); + pr_err("ashmem: failed to register misc device!\n"); return ret; } register_shrinker(&ashmem_shrinker); - printk(KERN_INFO "ashmem: initialized\n"); + pr_info("ashmem: initialized\n"); return 0; } @@ -740,12 +740,12 @@ static void __exit ashmem_exit(void) ret = misc_deregister(&ashmem_misc); if (unlikely(ret)) - printk(KERN_ERR "ashmem: failed to unregister misc device!\n"); + pr_err("ashmem: failed to unregister misc device!\n"); kmem_cache_destroy(ashmem_range_cachep); kmem_cache_destroy(ashmem_area_cachep); - printk(KERN_INFO "ashmem: unloaded\n"); + pr_info("ashmem: unloaded\n"); } module_init(ashmem_init); diff --git a/drivers/staging/android/logger.c b/drivers/staging/android/logger.c index b2e71c6..f808552 100644 --- a/drivers/staging/android/logger.c +++ b/drivers/staging/android/logger.c @@ -621,13 +621,13 @@ static int __init create_log(char *log_name, int size) /* finally, initialize the misc device for this log */ ret = misc_register(&log->misc); if (unlikely(ret)) { - printk(KERN_ERR "logger: failed to register misc " - "device for log '%s'!\n", log->misc.name); + pr_err("logger: failed to register misc device for log '%s'!\n", + log->misc.name); goto out_free_log; } - printk(KERN_INFO "logger: created %luK log '%s'\n", - (unsigned long) log->size >> 10, log->misc.name); + pr_info("logger: created %luK log '%s'\n", + (unsigned long) log->size >> 10, log->misc.name); return 0; diff --git a/drivers/staging/android/ram_console.c b/drivers/staging/android/ram_console.c index 82323bb..3c5b398 100644 --- a/drivers/staging/android/ram_console.c +++ b/drivers/staging/android/ram_console.c @@ -162,7 +162,7 @@ static int __init ram_console_late_init(void) entry = create_proc_entry("last_kmsg", S_IFREG | S_IRUGO, NULL); if (!entry) { - printk(KERN_ERR "ram_console: failed to create proc entry\n"); + pr_err("ram_console: failed to create proc entry\n"); persistent_ram_free_old(prz); return 0; } diff --git a/drivers/staging/android/timed_output.c b/drivers/staging/android/timed_output.c index 38d930c..b383381 100644 --- a/drivers/staging/android/timed_output.c +++ b/drivers/staging/android/timed_output.c @@ -90,7 +90,7 @@ int timed_output_dev_register(struct timed_output_dev *tdev) err_create_file: device_destroy(timed_output_class, MKDEV(0, tdev->index)); - printk(KERN_ERR "timed_output: Failed to register driver %s\n", + pr_err("timed_output: Failed to register driver %s\n", tdev->name); return ret;