summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/greybus/debugfs.c2
-rw-r--r--drivers/staging/greybus/hd.c4
-rw-r--r--drivers/staging/greybus/operation.c2
3 files changed, 2 insertions, 6 deletions
diff --git a/drivers/staging/greybus/debugfs.c b/drivers/staging/greybus/debugfs.c
index 725565d..a9d4d3d 100644
--- a/drivers/staging/greybus/debugfs.c
+++ b/drivers/staging/greybus/debugfs.c
@@ -7,8 +7,6 @@
* Released under the GPLv2 only.
*/
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
#include <linux/debugfs.h>
#include "greybus.h"
diff --git a/drivers/staging/greybus/hd.c b/drivers/staging/greybus/hd.c
index d1aab29..147a92d 100644
--- a/drivers/staging/greybus/hd.c
+++ b/drivers/staging/greybus/hd.c
@@ -7,8 +7,6 @@
* Released under the GPLv2 only.
*/
-#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
-
#include <linux/kernel.h>
#include <linux/slab.h>
@@ -55,7 +53,7 @@ struct gb_host_device *gb_hd_create(struct gb_hd_driver *driver,
* so that we don't have to every time we make them.
*/
if ((!driver->message_send) || (!driver->message_cancel)) {
- pr_err("Must implement all gb_hd_driver callbacks!\n");
+ dev_err(parent, "mandatory hd-callbacks missing\n");
return ERR_PTR(-EINVAL);
}
diff --git a/drivers/staging/greybus/operation.c b/drivers/staging/greybus/operation.c
index d6b3d1f..bd79f81 100644
--- a/drivers/staging/greybus/operation.c
+++ b/drivers/staging/greybus/operation.c
@@ -327,7 +327,7 @@ gb_operation_message_alloc(struct gb_host_device *hd, u8 type,
size_t message_size = payload_size + sizeof(*header);
if (message_size > hd->buffer_size_max) {
- pr_warn("requested message size too big (%zu > %zu)\n",
+ dev_warn(&hd->dev, "requested message size too big (%zu > %zu)\n",
message_size, hd->buffer_size_max);
return NULL;
}
OpenPOWER on IntegriCloud