From: Julia Lawall <julia.law...@lip6.fr>

Use WARN rather than printk followed by WARN_ON(1), for conciseness.

A simplified version of the semantic patch that makes this transformation
is as follows: (http://coccinelle.lip6.fr/)

// <smpl>
@@
expression list es;
@@

-printk(
+WARN(1,
  es);
-WARN_ON(1);
// </smpl>

Signed-off-by: Julia Lawall <julia.law...@lip6.fr>

---
 drivers/parisc/pdc_stable.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/parisc/pdc_stable.c b/drivers/parisc/pdc_stable.c
index 246a92f..0f54ab6 100644
--- a/drivers/parisc/pdc_stable.c
+++ b/drivers/parisc/pdc_stable.c
@@ -212,12 +212,10 @@ pdcspath_store(struct pdcspath_entry *entry)
                        entry, devpath, entry->addr);
 
        /* addr, devpath and count must be word aligned */
-       if (pdc_stable_write(entry->addr, devpath, sizeof(*devpath)) != PDC_OK) 
{
-               printk(KERN_ERR "%s: an error occurred when writing to PDC.\n"
+       if (pdc_stable_write(entry->addr, devpath, sizeof(*devpath)) != PDC_OK)
+               WARN(1, KERN_ERR "%s: an error occurred when writing to PDC.\n"
                                "It is likely that the Stable Storage data has 
been corrupted.\n"
                                "Please check it carefully upon next 
reboot.\n", __func__);
-               WARN_ON(1);
-       }
                
        /* kobject is already registered */
        entry->ready = 2;

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to