aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMarkus Lidel <markus.lidel@shadowconnect.com>2005-01-14 23:35:06 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-01-14 23:35:06 -0800
commit12b29a3a9bcfad4e245f4cf3bbc4812641ecc1ea (patch)
tree63e9f9cf579604e14aadc326dc1f2272feaf90ea /include
parentb4d71a318fbe18f5fc6982d0f0b8dc4cf1d97fe4 (diff)
downloadhistory-12b29a3a9bcfad4e245f4cf3bbc4812641ecc1ea.tar.gz
[PATCH] I2O: printk cleanup and unnecessary code removal
- removed commented part in header which is not used anymore - added wrappers for printk to make code more readable - cleaned up logging output and removed unneccessary output Signed-off-by: Markus Lidel <Markus.Lidel@shadowconnect.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
-rw-r--r--include/linux/i2o.h28
1 files changed, 19 insertions, 9 deletions
diff --git a/include/linux/i2o.h b/include/linux/i2o.h
index ba2e945d31f465..ea9a3ad4b67fc2 100644
--- a/include/linux/i2o.h
+++ b/include/linux/i2o.h
@@ -631,15 +631,25 @@ static inline void i2o_dma_unmap(struct device *dev, struct i2o_dma *addr)
extern int i2o_parm_field_get(struct i2o_device *, int, int, void *, int);
extern int i2o_parm_table_get(struct i2o_device *, int, int, int, void *, int,
void *, int);
-/* FIXME: remove
-extern int i2o_query_table(int, struct i2o_controller *, int, int, int,
- void *, int, void *, int);
-extern int i2o_clear_table(struct i2o_controller *, int, int);
-extern int i2o_row_add_table(struct i2o_controller *, int, int, int,
- void *, int);
-extern int i2o_issue_params(int, struct i2o_controller *, int, void *, int,
- void *, int);
-*/
+
+/* debugging and troubleshooting/diagnostic helpers. */
+#define osm_printk(level, format, arg...) \
+ printk(level "%s: " format, OSM_NAME , ## arg)
+
+#ifdef DEBUG
+#define osm_debug(format, arg...) \
+ osm_printk(KERN_DEBUG, format , ## arg)
+#else
+#define osm_debug(format, arg...) \
+ do { } while (0)
+#endif
+
+#define osm_err(format, arg...) \
+ osm_printk(KERN_ERR, format , ## arg)
+#define osm_info(format, arg...) \
+ osm_printk(KERN_INFO, format , ## arg)
+#define osm_warn(format, arg...) \
+ osm_printk(KERN_WARNING, format , ## arg)
/* debugging functions */
extern void i2o_report_status(const char *, const char *, struct i2o_message *);