Skip to content

Commit

Permalink
staging: asus_oled: Change printk calls to dev_xxx
Browse files Browse the repository at this point in the history
- Use dev_err whenever a struct device * is present
- None of the printk calls had levels set, but looked like they should
  probably be dev_err

Signed-off-by: Jonathan Brett <jonbrett.dev@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Jonathan Brett authored and Greg Kroah-Hartman committed Aug 15, 2012
1 parent c2dea97 commit 9c8adb8
Showing 1 changed file with 8 additions and 10 deletions.
18 changes: 8 additions & 10 deletions drivers/staging/asus_oled/asus_oled.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@
#define ASUS_OLED_NAME "asus-oled"
#define ASUS_OLED_UNDERSCORE_NAME "asus_oled"

#define ASUS_OLED_ERROR "Asus OLED Display Error: "

#define ASUS_OLED_STATIC 's'
#define ASUS_OLED_ROLL 'r'
#define ASUS_OLED_FLASH 'f'
Expand Down Expand Up @@ -383,13 +381,13 @@ static int append_values(struct asus_oled_dev *odev, uint8_t val, size_t count)

default:
i = 0;
printk(ASUS_OLED_ERROR "Unknown OLED Pack Mode: %d!\n",
dev_err(odev->dev, "Unknown OLED Pack Mode: %d!\n",
odev->pack_mode);
break;
}

if (i >= odev->buf_size) {
printk(ASUS_OLED_ERROR "Buffer overflow! Report a bug:"
dev_err(odev->dev, "Buffer overflow! Report a bug:"
"offs: %d >= %d i: %d (x: %d y: %d)\n",
(int) odev->buf_offs, (int) odev->buf_size,
(int) i, (int) x, (int) y);
Expand Down Expand Up @@ -435,7 +433,7 @@ static ssize_t odev_set_picture(struct asus_oled_dev *odev,
odev->buf = kmalloc(odev->buf_size, GFP_KERNEL);
if (odev->buf == NULL) {
odev->buf_size = 0;
printk(ASUS_OLED_ERROR "Out of memory!\n");
dev_err(odev->dev, "Out of memory!\n");
return -ENOMEM;
}

Expand Down Expand Up @@ -473,7 +471,7 @@ static ssize_t odev_set_picture(struct asus_oled_dev *odev,
odev->pic_mode = buf[1];
break;
default:
printk(ASUS_OLED_ERROR "Wrong picture mode: '%c'.\n",
dev_err(odev->dev, "Wrong picture mode: '%c'.\n",
buf[1]);
return -EIO;
break;
Expand Down Expand Up @@ -533,7 +531,7 @@ static ssize_t odev_set_picture(struct asus_oled_dev *odev,

if (odev->buf == NULL) {
odev->buf_size = 0;
printk(ASUS_OLED_ERROR "Out of memory!\n");
dev_err(odev->dev, "Out of memory!\n");
return -ENOMEM;
}

Expand Down Expand Up @@ -593,15 +591,15 @@ static ssize_t odev_set_picture(struct asus_oled_dev *odev,
return count;

error_width:
printk(ASUS_OLED_ERROR "Wrong picture width specified.\n");
dev_err(odev->dev, "Wrong picture width specified.\n");
return -EIO;

error_height:
printk(ASUS_OLED_ERROR "Wrong picture height specified.\n");
dev_err(odev->dev, "Wrong picture height specified.\n");
return -EIO;

error_header:
printk(ASUS_OLED_ERROR "Wrong picture header.\n");
dev_err(odev->dev, "Wrong picture header.\n");
return -EIO;
}

Expand Down

0 comments on commit 9c8adb8

Please sign in to comment.