From df02b50acfcec04cd50abc5f6265118d2cdacbee Mon Sep 17 00:00:00 2001 From: Haneen Mohammed Date: Tue, 17 Mar 2015 08:34:20 +0300 Subject: Staging: gdm724x: replace pr_err with dev_err This patch replace pr_err with dev_err, when appropriate device structre is found. Issue found using the following Coccinelle script: @r exists@ identifier f, s, i; position p; @@ f(...,struct s *i,...) { <+... when != i == NULL pr_err@p(...); ...+> } @rr@ identifier r.s, fld; @@ struct s { ... struct device *fld; ... }; @@ identifier r.i, rr.fld; position r.p; @@ -pr_err@p +dev_err ( + i->fld, ...) Signed-off-by: Haneen Mohammed Signed-off-by: Greg Kroah-Hartman --- drivers/staging/gdm724x/gdm_mux.c | 4 ++-- drivers/staging/gdm724x/gdm_usb.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/gdm724x/gdm_mux.c b/drivers/staging/gdm724x/gdm_mux.c index d1ab996b3305..b987ba0510b7 100644 --- a/drivers/staging/gdm724x/gdm_mux.c +++ b/drivers/staging/gdm724x/gdm_mux.c @@ -608,7 +608,7 @@ static int gdm_mux_suspend(struct usb_interface *intf, pm_message_t pm_msg) rx = &mux_dev->rx; if (mux_dev->usb_state != PM_NORMAL) { - pr_err("usb suspend - invalid state\n"); + dev_err(intf->usb_dev, "usb suspend - invalid state\n"); return -1; } @@ -637,7 +637,7 @@ static int gdm_mux_resume(struct usb_interface *intf) mux_dev = tty_dev->priv_dev; if (mux_dev->usb_state != PM_SUSPEND) { - pr_err("usb resume - invalid state\n"); + dev_err(intf->usb_dev, "usb resume - invalid state\n"); return -1; } diff --git a/drivers/staging/gdm724x/gdm_usb.c b/drivers/staging/gdm724x/gdm_usb.c index d2a3b350ba6d..d59810f78c32 100644 --- a/drivers/staging/gdm724x/gdm_usb.c +++ b/drivers/staging/gdm724x/gdm_usb.c @@ -848,7 +848,7 @@ static int gdm_usb_probe(struct usb_interface *intf, udev->usbdev = usbdev; ret = init_usb(udev); if (ret < 0) { - pr_err("init_usb func failed\n"); + dev_err(intf->usb_dev, "init_usb func failed\n"); goto err_init_usb; } udev->intf = intf; @@ -867,7 +867,7 @@ static int gdm_usb_probe(struct usb_interface *intf, ret = request_mac_address(udev); if (ret < 0) { - pr_err("request Mac address failed\n"); + dev_err(intf->usb_dev, "request Mac address failed\n"); goto err_mac_address; } @@ -928,7 +928,7 @@ static int gdm_usb_suspend(struct usb_interface *intf, pm_message_t pm_msg) udev = phy_dev->priv_dev; rx = &udev->rx; if (udev->usb_state != PM_NORMAL) { - pr_err("usb suspend - invalid state\n"); + dev_err(intf->usb_dev, "usb suspend - invalid state\n"); return -1; } @@ -961,7 +961,7 @@ static int gdm_usb_resume(struct usb_interface *intf) rx = &udev->rx; if (udev->usb_state != PM_SUSPEND) { - pr_err("usb resume - invalid state\n"); + dev_err(intf->usb_dev, "usb resume - invalid state\n"); return -1; } udev->usb_state = PM_NORMAL; -- cgit v1.2.3-55-g7522