hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: fbtft: replace fbtft_dev_dbg with standard dev_dbg call 

This patch attempts to simplify the debugging using standard
dev_dbg call so that individual debug prints can be enabled or
disbled by dynamic debugging rather than using module params.

Signed-off-by: Madhusudhanan Ravindran <mravindr@visteon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Madhusudhanan Ravindran 2015-06-01 12:34:56 +00:00 committed by Greg Kroah-Hartman
parent e1f9ae3bca
commit b38c760ab0
3 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/fbtft/fb_agm1264k-fl.c
View File

@ -94,7 +94,7 @@ static void reset(struct fbtft_par *par)
if (par->gpio.reset == -1) if (par->gpio.reset == -1)
return; return;
fbtft_dev_dbg(DEBUG_RESET, par, par->info->device, "%s()\n", __func__); dev_dbg(par->info->device, "%s()\n", __func__);
gpio_set_value(par->gpio.reset, 0); gpio_set_value(par->gpio.reset, 0);
udelay(20); udelay(20);
@ -107,7 +107,7 @@ static int verify_gpios(struct fbtft_par *par)
{ {
int i; int i;
fbtft_dev_dbg(DEBUG_VERIFY_GPIOS, par, par->info->device, dev_dbg(par->info->device,
"%s()\n", __func__); "%s()\n", __func__);
if (par->EPIN < 0) { if (par->EPIN < 0) {
@ -145,7 +145,7 @@ static int verify_gpios(struct fbtft_par *par)
static unsigned long static unsigned long
request_gpios_match(struct fbtft_par *par, const struct fbtft_gpio *gpio) request_gpios_match(struct fbtft_par *par, const struct fbtft_gpio *gpio)
{ {
fbtft_dev_dbg(DEBUG_REQUEST_GPIOS_MATCH, par, par->info->device, dev_dbg(par->info->device,
"%s('%s')\n", __func__, gpio->name); "%s('%s')\n", __func__, gpio->name);
if (strcasecmp(gpio->name, "wr") == 0) { if (strcasecmp(gpio->name, "wr") == 0) {

15
drivers/staging/fbtft/fbtft-core.c
View File

@ -486,7 +486,7 @@ static void fbtft_deferred_io(struct fb_info *info, struct list_head *pagelist)
index = page->index << PAGE_SHIFT; index = page->index << PAGE_SHIFT;
y_low = index / info->fix.line_length; y_low = index / info->fix.line_length;
y_high = (index + PAGE_SIZE - 1) / info->fix.line_length; y_high = (index + PAGE_SIZE - 1) / info->fix.line_length;
fbtft_dev_dbg(DEBUG_DEFERRED_IO, par, info->device, dev_dbg(info->device,
"page->index=%lu y_low=%d y_high=%d\n", "page->index=%lu y_low=%d y_high=%d\n",
page->index, y_low, y_high); page->index, y_low, y_high);
if (y_high > info->var.yres - 1) if (y_high > info->var.yres - 1)
@ -507,7 +507,7 @@ static void fbtft_fb_fillrect(struct fb_info *info,
{ {
struct fbtft_par *par = info->par; struct fbtft_par *par = info->par;
fbtft_dev_dbg(DEBUG_FB_FILLRECT, par, info->dev, dev_dbg(info->dev,
"%s: dx=%d, dy=%d, width=%d, height=%d\n", "%s: dx=%d, dy=%d, width=%d, height=%d\n",
__func__, rect->dx, rect->dy, rect->width, rect->height); __func__, rect->dx, rect->dy, rect->width, rect->height);
sys_fillrect(info, rect); sys_fillrect(info, rect);
@ -520,7 +520,7 @@ static void fbtft_fb_copyarea(struct fb_info *info,
{ {
struct fbtft_par *par = info->par; struct fbtft_par *par = info->par;
fbtft_dev_dbg(DEBUG_FB_COPYAREA, par, info->dev, dev_dbg(info->dev,
"%s: dx=%d, dy=%d, width=%d, height=%d\n", "%s: dx=%d, dy=%d, width=%d, height=%d\n",
__func__, area->dx, area->dy, area->width, area->height); __func__, area->dx, area->dy, area->width, area->height);
sys_copyarea(info, area); sys_copyarea(info, area);
@ -533,7 +533,7 @@ static void fbtft_fb_imageblit(struct fb_info *info,
{ {
struct fbtft_par *par = info->par; struct fbtft_par *par = info->par;
fbtft_dev_dbg(DEBUG_FB_IMAGEBLIT, par, info->dev, dev_dbg(info->dev,
"%s: dx=%d, dy=%d, width=%d, height=%d\n", "%s: dx=%d, dy=%d, width=%d, height=%d\n",
__func__, image->dx, image->dy, image->width, image->height); __func__, image->dx, image->dy, image->width, image->height);
sys_imageblit(info, image); sys_imageblit(info, image);
@ -547,7 +547,7 @@ static ssize_t fbtft_fb_write(struct fb_info *info, const char __user *buf,
struct fbtft_par *par = info->par; struct fbtft_par *par = info->par;
ssize_t res; ssize_t res;
fbtft_dev_dbg(DEBUG_FB_WRITE, par, info->dev, dev_dbg(info->dev,
"%s: count=%zd, ppos=%llu\n", __func__, count, *ppos); "%s: count=%zd, ppos=%llu\n", __func__, count, *ppos);
res = fb_sys_write(info, buf, count, ppos); res = fb_sys_write(info, buf, count, ppos);
@ -570,11 +570,10 @@ static int fbtft_fb_setcolreg(unsigned regno, unsigned red, unsigned green,
unsigned blue, unsigned transp, unsigned blue, unsigned transp,
struct fb_info *info) struct fb_info *info)
{ {
struct fbtft_par *par = info->par;
unsigned val; unsigned val;
int ret = 1; int ret = 1;
fbtft_dev_dbg(DEBUG_FB_SETCOLREG, par, info->dev, dev_dbg(info->dev,
"%s(regno=%u, red=0x%X, green=0x%X, blue=0x%X, trans=0x%X)\n", "%s(regno=%u, red=0x%X, green=0x%X, blue=0x%X, trans=0x%X)\n",
__func__, regno, red, green, blue, transp); __func__, regno, red, green, blue, transp);
@ -601,7 +600,7 @@ static int fbtft_fb_blank(int blank, struct fb_info *info)
struct fbtft_par *par = info->par; struct fbtft_par *par = info->par;
int ret = -EINVAL; int ret = -EINVAL;
fbtft_dev_dbg(DEBUG_FB_BLANK, par, info->dev, "%s(blank=%d)\n", dev_dbg(info->dev, "%s(blank=%d)\n",
__func__, blank); __func__, blank);
if (!par->fbtftops.blank) if (!par->fbtftops.blank)

5
drivers/staging/fbtft/fbtft.h
View File

@ -430,11 +430,6 @@ do { \
dev_info(par->info->device, format, ##arg); \ dev_info(par->info->device, format, ##arg); \
} while (0) } while (0)
#define fbtft_dev_dbg(level, par, dev, format, arg...) \
do { \
if (unlikely(par->debug & level)) \
dev_info(dev, format, ##arg); \
} while (0)
#define fbtft_par_dbg_hex(level, par, dev, type, buf, num, format, arg...) \ #define fbtft_par_dbg_hex(level, par, dev, type, buf, num, format, arg...) \
do { \ do { \