redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

Staging: fbtft: fixed unsigned type warnings

Browse source 
Replace unsigned by unsigned int in fbtft driver.  Issue found by
checkpatch.

Signed-off-by: Ming Yang <minos.future@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ming Yang 2016-07-17 19:13:18 -07:00 committed by Greg Kroah-Hartman
parent 175f5a4130
commit 1c41494adf
11 changed files with 58 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/staging/fbtft/fb_ili9320.c
View file

@ -29,7 +29,7 @@
#define DEFAULT_GAMMA "07 07 6 0 0 0 5 5 4 0\n" \ #define DEFAULT_GAMMA "07 07 6 0 0 0 5 5 4 0\n" \
"07 08 4 7 5 1 2 0 7 7" "07 08 4 7 5 1 2 0 7 7"
static unsigned read_devicecode(struct fbtft_par *par) static unsigned int read_devicecode(struct fbtft_par *par)
{ {
int ret; int ret;
u8 rxbuf[8] = {0, }; u8 rxbuf[8] = {0, };
@ -41,7 +41,7 @@ static unsigned read_devicecode(struct fbtft_par *par)
static int init_display(struct fbtft_par *par) static int init_display(struct fbtft_par *par)
{ {
unsigned devcode; unsigned int devcode;
par->fbtftops.reset(par); par->fbtftops.reset(par);

10
drivers/staging/fbtft/fb_ili9325.c
View file

@ -32,26 +32,26 @@
#define DEFAULT_GAMMA "0F 00 7 2 0 0 6 5 4 1\n" \ #define DEFAULT_GAMMA "0F 00 7 2 0 0 6 5 4 1\n" \
"04 16 2 7 6 3 2 1 7 7" "04 16 2 7 6 3 2 1 7 7"
static unsigned bt = 6; /* VGL=Vci*4 , VGH=Vci*4 */ static unsigned int bt = 6; /* VGL=Vci*4 , VGH=Vci*4 */
module_param(bt, uint, 0); module_param(bt, uint, 0);
MODULE_PARM_DESC(bt, "Sets the factor used in the step-up circuits"); MODULE_PARM_DESC(bt, "Sets the factor used in the step-up circuits");
static unsigned vc = 0x03; /* Vci1=Vci*0.80 */ static unsigned int vc = 0x03; /* Vci1=Vci*0.80 */
module_param(vc, uint, 0); module_param(vc, uint, 0);
MODULE_PARM_DESC(vc, MODULE_PARM_DESC(vc,
"Sets the ratio factor of Vci to generate the reference voltages Vci1"); "Sets the ratio factor of Vci to generate the reference voltages Vci1");
static unsigned vrh = 0x0d; /* VREG1OUT=Vci*1.85 */ static unsigned int vrh = 0x0d; /* VREG1OUT=Vci*1.85 */
module_param(vrh, uint, 0); module_param(vrh, uint, 0);
MODULE_PARM_DESC(vrh, MODULE_PARM_DESC(vrh,
"Set the amplifying rate (1.6 ~ 1.9) of Vci applied to output the VREG1OUT"); "Set the amplifying rate (1.6 ~ 1.9) of Vci applied to output the VREG1OUT");
static unsigned vdv = 0x12; /* VCOMH amplitude=VREG1OUT*0.98 */ static unsigned int vdv = 0x12; /* VCOMH amplitude=VREG1OUT*0.98 */
module_param(vdv, uint, 0); module_param(vdv, uint, 0);
MODULE_PARM_DESC(vdv, MODULE_PARM_DESC(vdv,
"Select the factor of VREG1OUT to set the amplitude of Vcom"); "Select the factor of VREG1OUT to set the amplitude of Vcom");
static unsigned vcm = 0x0a; /* VCOMH=VREG1OUT*0.735 */ static unsigned int vcm = 0x0a; /* VCOMH=VREG1OUT*0.735 */
module_param(vcm, uint, 0); module_param(vcm, uint, 0);
MODULE_PARM_DESC(vcm, "Set the internal VcomH voltage"); MODULE_PARM_DESC(vcm, "Set the internal VcomH voltage");

4
drivers/staging/fbtft/fb_pcd8544.c
View file

@ -32,11 +32,11 @@
#define TXBUFLEN (84 * 6) #define TXBUFLEN (84 * 6)
#define DEFAULT_GAMMA "40" /* gamma controls the contrast in this driver */ #define DEFAULT_GAMMA "40" /* gamma controls the contrast in this driver */
static unsigned tc; static unsigned int tc;
module_param(tc, uint, 0); module_param(tc, uint, 0);
MODULE_PARM_DESC(tc, "TC[1:0] Temperature coefficient: 0-3 (default: 0)"); MODULE_PARM_DESC(tc, "TC[1:0] Temperature coefficient: 0-3 (default: 0)");
static unsigned bs = 4; static unsigned int bs = 4;
module_param(bs, uint, 0); module_param(bs, uint, 0);
MODULE_PARM_DESC(bs, "BS[2:0] Bias voltage level: 0-7 (default: 4)"); MODULE_PARM_DESC(bs, "BS[2:0] Bias voltage level: 0-7 (default: 4)");

2
drivers/staging/fbtft/fb_ssd1289.c
View file

@ -29,7 +29,7 @@
#define DEFAULT_GAMMA "02 03 2 5 7 7 4 2 4 2\n" \ #define DEFAULT_GAMMA "02 03 2 5 7 7 4 2 4 2\n" \
"02 03 2 5 7 5 4 2 4 2" "02 03 2 5 7 5 4 2 4 2"
static unsigned reg11 = 0x6040; static unsigned int reg11 = 0x6040;
module_param(reg11, uint, 0); module_param(reg11, uint, 0);
MODULE_PARM_DESC(reg11, "Register 11h value"); MODULE_PARM_DESC(reg11, "Register 11h value");

2
drivers/staging/fbtft/fb_ssd1351.c
View file

@ -66,7 +66,7 @@ static void set_addr_win(struct fbtft_par *par, int xs, int ys, int xe, int ye)
static int set_var(struct fbtft_par *par) static int set_var(struct fbtft_par *par)
{ {
unsigned remap; unsigned int remap;
if (par->fbtftops.init_display != init_display) { if (par->fbtftops.init_display != init_display) {
/* don't risk messing up register A0h */ /* don't risk messing up register A0h */

2
drivers/staging/fbtft/fb_tls8204.c
View file

@ -35,7 +35,7 @@
/* gamma is used to control contrast in this driver */ /* gamma is used to control contrast in this driver */
#define DEFAULT_GAMMA "40" #define DEFAULT_GAMMA "40"
static unsigned bs = 4; static unsigned int bs = 4;
module_param(bs, uint, 0); module_param(bs, uint, 0);
MODULE_PARM_DESC(bs, "BS[2:0] Bias voltage level: 0-7 (default: 4)"); MODULE_PARM_DESC(bs, "BS[2:0] Bias voltage level: 0-7 (default: 4)");

12
drivers/staging/fbtft/fb_uc1611.c
View file

@ -41,30 +41,30 @@
*/ */
/* BR -> actual ratio: 0-3 -> 5, 10, 11, 13 */ /* BR -> actual ratio: 0-3 -> 5, 10, 11, 13 */
static unsigned ratio = 2; static unsigned int ratio = 2;
module_param(ratio, uint, 0); module_param(ratio, uint, 0);
MODULE_PARM_DESC(ratio, "BR[1:0] Bias voltage ratio: 0-3 (default: 2)"); MODULE_PARM_DESC(ratio, "BR[1:0] Bias voltage ratio: 0-3 (default: 2)");
static unsigned gain = 3; static unsigned int gain = 3;
module_param(gain, uint, 0); module_param(gain, uint, 0);
MODULE_PARM_DESC(gain, "GN[1:0] Bias voltage gain: 0-3 (default: 3)"); MODULE_PARM_DESC(gain, "GN[1:0] Bias voltage gain: 0-3 (default: 3)");
static unsigned pot = 16; static unsigned int pot = 16;
module_param(pot, uint, 0); module_param(pot, uint, 0);
MODULE_PARM_DESC(pot, "PM[6:0] Bias voltage pot.: 0-63 (default: 16)"); MODULE_PARM_DESC(pot, "PM[6:0] Bias voltage pot.: 0-63 (default: 16)");
/* TC -> % compensation per deg C: 0-3 -> -.05, -.10, -.015, -.20 */ /* TC -> % compensation per deg C: 0-3 -> -.05, -.10, -.015, -.20 */
static unsigned temp; static unsigned int temp;
module_param(temp, uint, 0); module_param(temp, uint, 0);
MODULE_PARM_DESC(temp, "TC[1:0] Temperature compensation: 0-3 (default: 0)"); MODULE_PARM_DESC(temp, "TC[1:0] Temperature compensation: 0-3 (default: 0)");
/* PC[1:0] -> LCD capacitance: 0-3 -> <20nF, 20-28 nF, 29-40 nF, 40-56 nF */ /* PC[1:0] -> LCD capacitance: 0-3 -> <20nF, 20-28 nF, 29-40 nF, 40-56 nF */
static unsigned load = 1; static unsigned int load = 1;
module_param(load, uint, 0); module_param(load, uint, 0);
MODULE_PARM_DESC(load, "PC[1:0] Panel Loading: 0-3 (default: 1)"); MODULE_PARM_DESC(load, "PC[1:0] Panel Loading: 0-3 (default: 1)");
/* PC[3:2] -> V_LCD: 0, 1, 3 -> ext., int. with ratio = 5, int. standard */ /* PC[3:2] -> V_LCD: 0, 1, 3 -> ext., int. with ratio = 5, int. standard */
static unsigned pump = 3; static unsigned int pump = 3;
module_param(pump, uint, 0); module_param(pump, uint, 0);
MODULE_PARM_DESC(pump, "PC[3:2] Pump control: 0,1,3 (default: 3)"); MODULE_PARM_DESC(pump, "PC[3:2] Pump control: 0,1,3 (default: 3)");

8
drivers/staging/fbtft/fb_watterott.c
View file

@ -67,7 +67,7 @@ static void write_reg8_bus8(struct fbtft_par *par, int len, ...)
static int write_vmem(struct fbtft_par *par, size_t offset, size_t len) static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)
{ {
unsigned start_line, end_line; unsigned int start_line, end_line;
u16 *vmem16 = (u16 *)(par->info->screen_buffer + offset); u16 *vmem16 = (u16 *)(par->info->screen_buffer + offset);
u16 *pos = par->txbuf.buf + 1; u16 *pos = par->txbuf.buf + 1;
u16 *buf16 = par->txbuf.buf + 10; u16 *buf16 = par->txbuf.buf + 10;
@ -104,7 +104,7 @@ static int write_vmem(struct fbtft_par *par, size_t offset, size_t len)
static int write_vmem_8bit(struct fbtft_par *par, size_t offset, size_t len) static int write_vmem_8bit(struct fbtft_par *par, size_t offset, size_t len)
{ {
unsigned start_line, end_line; unsigned int start_line, end_line;
u16 *vmem16 = (u16 *)(par->info->screen_buffer + offset); u16 *vmem16 = (u16 *)(par->info->screen_buffer + offset);
u16 *pos = par->txbuf.buf + 1; u16 *pos = par->txbuf.buf + 1;
u8 *buf8 = par->txbuf.buf + 10; u8 *buf8 = par->txbuf.buf + 10;
@ -137,7 +137,7 @@ static int write_vmem_8bit(struct fbtft_par *par, size_t offset, size_t len)
return 0; return 0;
} }
static unsigned firmware_version(struct fbtft_par *par) static unsigned int firmware_version(struct fbtft_par *par)
{ {
u8 rxbuf[4] = {0, }; u8 rxbuf[4] = {0, };
@ -152,7 +152,7 @@ static unsigned firmware_version(struct fbtft_par *par)
static int init_display(struct fbtft_par *par) static int init_display(struct fbtft_par *par)
{ {
int ret; int ret;
unsigned version; unsigned int version;
u8 save_mode; u8 save_mode;
/* enable SPI interface by having CS and MOSI low during reset */ /* enable SPI interface by having CS and MOSI low during reset */

24
drivers/staging/fbtft/fbtft-core.c
View file

@ -341,8 +341,8 @@ static void fbtft_reset(struct fbtft_par *par)
mdelay(120); mdelay(120);
} }
static void fbtft_update_display(struct fbtft_par *par, unsigned start_line, static void fbtft_update_display(struct fbtft_par *par, unsigned int start_line,
unsigned end_line) unsigned int end_line)
{ {
size_t offset, len; size_t offset, len;
ktime_t ts_start, ts_end; ktime_t ts_start, ts_end;
@ -435,10 +435,10 @@ static void fbtft_mkdirty(struct fb_info *info, int y, int height)
static void fbtft_deferred_io(struct fb_info *info, struct list_head *pagelist) static void fbtft_deferred_io(struct fb_info *info, struct list_head *pagelist)
{ {
struct fbtft_par *par = info->par; struct fbtft_par *par = info->par;
unsigned dirty_lines_start, dirty_lines_end; unsigned int dirty_lines_start, dirty_lines_end;
struct page *page; struct page *page;
unsigned long index; unsigned long index;
unsigned y_low = 0, y_high = 0; unsigned int y_low = 0, y_high = 0;
int count = 0; int count = 0;
spin_lock(&par->dirty_lock); spin_lock(&par->dirty_lock);
@ -526,18 +526,18 @@ static ssize_t fbtft_fb_write(struct fb_info *info, const char __user *buf,
} }
/* from pxafb.c */ /* from pxafb.c */
static unsigned int chan_to_field(unsigned chan, struct fb_bitfield *bf) static unsigned int chan_to_field(unsigned int chan, struct fb_bitfield *bf)
{ {
chan &= 0xffff; chan &= 0xffff;
chan >>= 16 - bf->length; chan >>= 16 - bf->length;
return chan << bf->offset; return chan << bf->offset;
} }
static int fbtft_fb_setcolreg(unsigned regno, unsigned red, unsigned green, static int fbtft_fb_setcolreg(unsigned int regno, unsigned int red, unsigned int green,
unsigned blue, unsigned transp, unsigned int blue, unsigned int transp,
struct fb_info *info) struct fb_info *info)
{ {
unsigned val; unsigned int val;
int ret = 1; int ret = 1;
dev_dbg(info->dev, dev_dbg(info->dev,
@ -654,11 +654,11 @@ struct fb_info *fbtft_framebuffer_alloc(struct fbtft_display *display,
u8 *vmem = NULL; u8 *vmem = NULL;
void *txbuf = NULL; void *txbuf = NULL;
void *buf = NULL; void *buf = NULL;
unsigned width; unsigned int width;
unsigned height; unsigned int height;
int txbuflen = display->txbuflen; int txbuflen = display->txbuflen;
unsigned bpp = display->bpp; unsigned int bpp = display->bpp;
unsigned fps = display->fps; unsigned int fps = display->fps;
int vmem_size, i; int vmem_size, i;
int *init_sequence = display->init_sequence; int *init_sequence = display->init_sequence;
char *gamma = display->gamma; char *gamma = display->gamma;

26
drivers/staging/fbtft/fbtft.h
View file

@ -38,7 +38,7 @@
*/ */
struct fbtft_gpio { struct fbtft_gpio {
char name[FBTFT_GPIO_NAME_SIZE]; char name[FBTFT_GPIO_NAME_SIZE];
unsigned gpio; unsigned int gpio;
}; };
struct fbtft_par; struct fbtft_par;
@ -79,7 +79,7 @@ struct fbtft_ops {
void (*reset)(struct fbtft_par *par); void (*reset)(struct fbtft_par *par);
void (*mkdirty)(struct fb_info *info, int from, int to); void (*mkdirty)(struct fb_info *info, int from, int to);
void (*update_display)(struct fbtft_par *par, void (*update_display)(struct fbtft_par *par,
unsigned start_line, unsigned end_line); unsigned int start_line, unsigned int end_line);
int (*init_display)(struct fbtft_par *par); int (*init_display)(struct fbtft_par *par);
int (*blank)(struct fbtft_par *par, bool on); int (*blank)(struct fbtft_par *par, bool on);
@ -115,14 +115,14 @@ struct fbtft_ops {
* This structure is not stored by FBTFT except for init_sequence. * This structure is not stored by FBTFT except for init_sequence.
*/ */
struct fbtft_display { struct fbtft_display {
unsigned width; unsigned int width;
unsigned height; unsigned int height;
unsigned regwidth; unsigned int regwidth;
unsigned buswidth; unsigned int buswidth;
unsigned backlight; unsigned int backlight;
struct fbtft_ops fbtftops; struct fbtft_ops fbtftops;
unsigned bpp; unsigned int bpp;
unsigned fps; unsigned int fps;
int txbuflen; int txbuflen;
int *init_sequence; int *init_sequence;
char *gamma; char *gamma;
@ -146,9 +146,9 @@ struct fbtft_display {
struct fbtft_platform_data { struct fbtft_platform_data {
struct fbtft_display display; struct fbtft_display display;
const struct fbtft_gpio *gpios; const struct fbtft_gpio *gpios;
unsigned rotate; unsigned int rotate;
bool bgr; bool bgr;
unsigned fps; unsigned int fps;
int txbuflen; int txbuflen;
u8 startbyte; u8 startbyte;
char *gamma; char *gamma;
@ -216,8 +216,8 @@ struct fbtft_par {
u8 startbyte; u8 startbyte;
struct fbtft_ops fbtftops; struct fbtft_ops fbtftops;
spinlock_t dirty_lock; spinlock_t dirty_lock;
unsigned dirty_lines_start; unsigned int dirty_lines_start;
unsigned dirty_lines_end; unsigned int dirty_lines_end;
struct { struct {
int reset; int reset;
int dc; int dc;

22
drivers/staging/fbtft/fbtft_device.c
View file

@ -32,20 +32,20 @@ static char *name;
module_param(name, charp, 0); module_param(name, charp, 0);
MODULE_PARM_DESC(name, "Devicename (required). name=list => list all supported devices."); MODULE_PARM_DESC(name, "Devicename (required). name=list => list all supported devices.");
static unsigned rotate; static unsigned int rotate;
module_param(rotate, uint, 0); module_param(rotate, uint, 0);
MODULE_PARM_DESC(rotate, MODULE_PARM_DESC(rotate,
"Angle to rotate display counter clockwise: 0, 90, 180, 270"); "Angle to rotate display counter clockwise: 0, 90, 180, 270");
static unsigned busnum; static unsigned int busnum;
module_param(busnum, uint, 0); module_param(busnum, uint, 0);
MODULE_PARM_DESC(busnum, "SPI bus number (default=0)"); MODULE_PARM_DESC(busnum, "SPI bus number (default=0)");
static unsigned cs; static unsigned int cs;
module_param(cs, uint, 0); module_param(cs, uint, 0);
MODULE_PARM_DESC(cs, "SPI chip select (default=0)"); MODULE_PARM_DESC(cs, "SPI chip select (default=0)");
static unsigned speed; static unsigned int speed;
module_param(speed, uint, 0); module_param(speed, uint, 0);
MODULE_PARM_DESC(speed, "SPI speed (override device default)"); MODULE_PARM_DESC(speed, "SPI speed (override device default)");
@ -58,7 +58,7 @@ module_param(gpios, charp, 0);
MODULE_PARM_DESC(gpios, MODULE_PARM_DESC(gpios,
"List of gpios. Comma separated with the form: reset:23,dc:24 (when overriding the default, all gpios must be specified)"); "List of gpios. Comma separated with the form: reset:23,dc:24 (when overriding the default, all gpios must be specified)");
static unsigned fps; static unsigned int fps;
module_param(fps, uint, 0); module_param(fps, uint, 0);
MODULE_PARM_DESC(fps, "Frames per second (override driver default)"); MODULE_PARM_DESC(fps, "Frames per second (override driver default)");
@ -76,7 +76,7 @@ module_param(bgr, int, 0);
MODULE_PARM_DESC(bgr, MODULE_PARM_DESC(bgr,
"BGR bit (supported by some drivers)."); "BGR bit (supported by some drivers).");
static unsigned startbyte; static unsigned int startbyte;
module_param(startbyte, uint, 0); module_param(startbyte, uint, 0);
MODULE_PARM_DESC(startbyte, "Sets the Start byte used by some SPI displays."); MODULE_PARM_DESC(startbyte, "Sets the Start byte used by some SPI displays.");
@ -84,15 +84,15 @@ static bool custom;
module_param(custom, bool, 0); module_param(custom, bool, 0);
MODULE_PARM_DESC(custom, "Add a custom display device. Use speed= argument to make it a SPI device, else platform_device"); MODULE_PARM_DESC(custom, "Add a custom display device. Use speed= argument to make it a SPI device, else platform_device");
static unsigned width; static unsigned int width;
module_param(width, uint, 0); module_param(width, uint, 0);
MODULE_PARM_DESC(width, "Display width, used with the custom argument"); MODULE_PARM_DESC(width, "Display width, used with the custom argument");
static unsigned height; static unsigned int height;
module_param(height, uint, 0); module_param(height, uint, 0);
MODULE_PARM_DESC(height, "Display height, used with the custom argument"); MODULE_PARM_DESC(height, "Display height, used with the custom argument");
static unsigned buswidth = 8; static unsigned int buswidth = 8;
module_param(buswidth, uint, 0); module_param(buswidth, uint, 0);
MODULE_PARM_DESC(buswidth, "Display bus width, used with the custom argument"); MODULE_PARM_DESC(buswidth, "Display bus width, used with the custom argument");
@ -106,7 +106,7 @@ module_param(debug, ulong, 0);
MODULE_PARM_DESC(debug, MODULE_PARM_DESC(debug,
"level: 0-7 (the remaining 29 bits is for advanced usage)"); "level: 0-7 (the remaining 29 bits is for advanced usage)");
static unsigned verbose = 3; static unsigned int verbose = 3;
module_param(verbose, uint, 0); module_param(verbose, uint, 0);
MODULE_PARM_DESC(verbose, MODULE_PARM_DESC(verbose,
"0 silent, >0 show gpios, >1 show devices, >2 show devices before (default=3)"); "0 silent, >0 show gpios, >1 show devices, >2 show devices before (default=3)");
@ -1346,7 +1346,7 @@ static void pr_p_devices(void)
} }
#ifdef MODULE #ifdef MODULE
static void fbtft_device_spi_delete(struct spi_master *master, unsigned cs) static void fbtft_device_spi_delete(struct spi_master *master, unsigned int cs)
{ {
struct device *dev; struct device *dev;
char str[32]; char str[32];