leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: fwserial: (coding style) Turning every "unsigned" into "unsigned int"

Browse Source 
Coding-style-only modifications to remove every warning saying:
WARNING: Prefer 'unsigned int' to bare use of 'unsigned'

Compiled against revision "next-20160327".

(checkpatch.pl was updated to treat "UNSPECIFIED_INT" warnings
 as of commit a1ce18e4f9 )

Signed-off-by: Dominique van den Broeck <domdevlin@free.fr>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Dominique van den Broeck 2016-03-29 19:14:20 +02:00 committed by Greg Kroah-Hartman
parent b2073dcb80
commit eeb6f1ba92
4 changed files with 53 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/staging/fwserial/dma_fifo.c
View File

@ -35,7 +35,7 @@
/* /*
* private helper fn to determine if check is in open interval (lo,hi) * private helper fn to determine if check is in open interval (lo,hi)
*/ */
static bool addr_check(unsigned check, unsigned lo, unsigned hi) static bool addr_check(unsigned int check, unsigned int lo, unsigned int hi)
{ {
return check - (lo + 1) < (hi - 1) - lo; return check - (lo + 1) < (hi - 1) - lo;
} }
@ -64,7 +64,7 @@ void dma_fifo_init(struct dma_fifo *fifo)
* The 'apparent' size will be rounded up to next greater aligned size. * The 'apparent' size will be rounded up to next greater aligned size.
* Returns 0 if no error, otherwise an error code * Returns 0 if no error, otherwise an error code
*/ */
int dma_fifo_alloc(struct dma_fifo *fifo, int size, unsigned align, int dma_fifo_alloc(struct dma_fifo *fifo, int size, unsigned int align,
int tx_limit, int open_limit, gfp_t gfp_mask) int tx_limit, int open_limit, gfp_t gfp_mask)
{ {
int capacity; int capacity;
@ -190,7 +190,7 @@ int dma_fifo_in(struct dma_fifo *fifo, const void *src, int n)
*/ */
int dma_fifo_out_pend(struct dma_fifo *fifo, struct dma_pending *pended) int dma_fifo_out_pend(struct dma_fifo *fifo, struct dma_pending *pended)
{ {
unsigned len, n, ofs, l, limit; unsigned int len, n, ofs, l, limit;
if (!fifo->data) if (!fifo->data)
return -ENOENT; return -ENOENT;
@ -210,7 +210,7 @@ int dma_fifo_out_pend(struct dma_fifo *fifo, struct dma_pending *pended)
n = len; n = len;
ofs = fifo->out % fifo->capacity; ofs = fifo->out % fifo->capacity;
l = fifo->capacity - ofs; l = fifo->capacity - ofs;
limit = min_t(unsigned, l, fifo->tx_limit); limit = min_t(unsigned int, l, fifo->tx_limit);
if (n > limit) { if (n > limit) {
n = limit; n = limit;
fifo->out += limit; fifo->out += limit;

16
drivers/staging/fwserial/dma_fifo.h
View File

@ -45,9 +45,9 @@
#define DMA_FIFO_GUARD 3 /* # of cache lines to reserve for the guard area */ #define DMA_FIFO_GUARD 3 /* # of cache lines to reserve for the guard area */
struct dma_fifo { struct dma_fifo {
unsigned in; unsigned int in;
unsigned out; /* updated when dma is pended */ unsigned int out; /* updated when dma is pended */
unsigned done; /* updated upon dma completion */ unsigned int done; /* updated upon dma completion */
struct { struct {
unsigned corrupt:1; unsigned corrupt:1;
}; };
@ -55,7 +55,7 @@ struct dma_fifo {
int guard; /* ofs of guard area */ int guard; /* ofs of guard area */
int capacity; /* size + reserved */ int capacity; /* size + reserved */
int avail; /* # of unused bytes in fifo */ int avail; /* # of unused bytes in fifo */
unsigned align; /* must be power of 2 */ unsigned int align; /* must be power of 2 */
int tx_limit; /* max # of bytes per dma transaction */ int tx_limit; /* max # of bytes per dma transaction */
int open_limit; /* max # of outstanding allowed */ int open_limit; /* max # of outstanding allowed */
int open; /* # of outstanding dma transactions */ int open; /* # of outstanding dma transactions */
@ -66,9 +66,9 @@ struct dma_fifo {
struct dma_pending { struct dma_pending {
struct list_head link; struct list_head link;
void *data; void *data;
unsigned len; unsigned int len;
unsigned next; unsigned int next;
unsigned out; unsigned int out;
}; };
static inline void dp_mark_completed(struct dma_pending *dp) static inline void dp_mark_completed(struct dma_pending *dp)
@ -82,7 +82,7 @@ static inline bool dp_is_completed(struct dma_pending *dp)
} }
void dma_fifo_init(struct dma_fifo *fifo); void dma_fifo_init(struct dma_fifo *fifo);
int dma_fifo_alloc(struct dma_fifo *fifo, int size, unsigned align, int dma_fifo_alloc(struct dma_fifo *fifo, int size, unsigned int align,
int tx_limit, int open_limit, gfp_t gfp_mask); int tx_limit, int open_limit, gfp_t gfp_mask);
void dma_fifo_free(struct dma_fifo *fifo); void dma_fifo_free(struct dma_fifo *fifo);
void dma_fifo_reset(struct dma_fifo *fifo); void dma_fifo_reset(struct dma_fifo *fifo);

38
drivers/staging/fwserial/fwserial.c
View File

@ -132,7 +132,7 @@ static struct fwtty_peer *__fwserial_peer_by_node_id(struct fw_card *card,
#ifdef FWTTY_PROFILING #ifdef FWTTY_PROFILING
static void fwtty_profile_fifo(struct fwtty_port *port, unsigned *stat) static void fwtty_profile_fifo(struct fwtty_port *port, unsigned int *stat)
{ {
spin_lock_bh(&port->lock); spin_lock_bh(&port->lock);
fwtty_profile_data(stat, dma_fifo_avail(&port->tx_fifo)); fwtty_profile_data(stat, dma_fifo_avail(&port->tx_fifo));
@ -143,7 +143,7 @@ static void fwtty_dump_profile(struct seq_file *m, struct stats *stats)
{ {
/* for each stat, print sum of 0 to 2^k, then individually */ /* for each stat, print sum of 0 to 2^k, then individually */
int k = 4; int k = 4;
unsigned sum; unsigned int sum;
int j; int j;
char t[10]; char t[10];
@ -303,9 +303,10 @@ static void fwtty_restart_tx(struct fwtty_port *port)
* Note: in loopback, the port->lock is being held. Only use functions that * Note: in loopback, the port->lock is being held. Only use functions that
* don't attempt to reclaim the port->lock. * don't attempt to reclaim the port->lock.
*/ */
static void fwtty_update_port_status(struct fwtty_port *port, unsigned status) static void fwtty_update_port_status(struct fwtty_port *port,
unsigned int status)
{ {
unsigned delta; unsigned int delta;
struct tty_struct *tty; struct tty_struct *tty;
/* simulated LSR/MSR status from remote */ /* simulated LSR/MSR status from remote */
@ -396,9 +397,9 @@ static void fwtty_update_port_status(struct fwtty_port *port, unsigned status)
* *
* Note: caller must be holding port lock * Note: caller must be holding port lock
*/ */
static unsigned __fwtty_port_line_status(struct fwtty_port *port) static unsigned int __fwtty_port_line_status(struct fwtty_port *port)
{ {
unsigned status = 0; unsigned int status = 0;
/* TODO: add module param to tie RNG to DTR as well */ /* TODO: add module param to tie RNG to DTR as well */
@ -424,7 +425,7 @@ static int __fwtty_write_port_status(struct fwtty_port *port)
{ {
struct fwtty_peer *peer; struct fwtty_peer *peer;
int err = -ENOENT; int err = -ENOENT;
unsigned status = __fwtty_port_line_status(port); unsigned int status = __fwtty_port_line_status(port);
rcu_read_lock(); rcu_read_lock();
peer = rcu_dereference(port->peer); peer = rcu_dereference(port->peer);
@ -454,7 +455,7 @@ static int fwtty_write_port_status(struct fwtty_port *port)
static void fwtty_throttle_port(struct fwtty_port *port) static void fwtty_throttle_port(struct fwtty_port *port)
{ {
struct tty_struct *tty; struct tty_struct *tty;
unsigned old; unsigned int old;
tty = tty_port_tty_get(&port->port); tty = tty_port_tty_get(&port->port);
if (!tty) if (!tty)
@ -540,7 +541,7 @@ static void fwtty_emit_breaks(struct work_struct *work)
static int fwtty_rx(struct fwtty_port *port, unsigned char *data, size_t len) static int fwtty_rx(struct fwtty_port *port, unsigned char *data, size_t len)
{ {
int c, n = len; int c, n = len;
unsigned lsr; unsigned int lsr;
int err = 0; int err = 0;
fwtty_dbg(port, "%d\n", n); fwtty_dbg(port, "%d\n", n);
@ -635,7 +636,7 @@ static void fwtty_port_handler(struct fw_card *card,
if (addr != port->rx_handler.offset || len != 4) { if (addr != port->rx_handler.offset || len != 4) {
rcode = RCODE_ADDRESS_ERROR; rcode = RCODE_ADDRESS_ERROR;
} else { } else {
fwtty_update_port_status(port, *(unsigned *)data); fwtty_update_port_status(port, *(unsigned int *)data);
rcode = RCODE_COMPLETE; rcode = RCODE_COMPLETE;
} }
break; break;
@ -828,7 +829,7 @@ static void fwtty_write_xchar(struct fwtty_port *port, char ch)
rcu_read_unlock(); rcu_read_unlock();
} }
static struct fwtty_port *fwtty_port_get(unsigned index) static struct fwtty_port *fwtty_port_get(unsigned int index)
{ {
struct fwtty_port *port; struct fwtty_port *port;
@ -934,9 +935,9 @@ static int fwtty_port_carrier_raised(struct tty_port *tty_port)
return rc; return rc;
} }
static unsigned set_termios(struct fwtty_port *port, struct tty_struct *tty) static unsigned int set_termios(struct fwtty_port *port, struct tty_struct *tty)
{ {
unsigned baud, frame; unsigned int baud, frame;
baud = tty_termios_baud_rate(&tty->termios); baud = tty_termios_baud_rate(&tty->termios);
tty_termios_encode_baud_rate(&tty->termios, baud, baud); tty_termios_encode_baud_rate(&tty->termios, baud, baud);
@ -988,7 +989,7 @@ static int fwtty_port_activate(struct tty_port *tty_port,
struct tty_struct *tty) struct tty_struct *tty)
{ {
struct fwtty_port *port = to_port(tty_port, port); struct fwtty_port *port = to_port(tty_port, port);
unsigned baud; unsigned int baud;
int err; int err;
set_bit(TTY_IO_ERROR, &tty->flags); set_bit(TTY_IO_ERROR, &tty->flags);
@ -1264,7 +1265,7 @@ static int set_serial_info(struct fwtty_port *port,
return 0; return 0;
} }
static int fwtty_ioctl(struct tty_struct *tty, unsigned cmd, static int fwtty_ioctl(struct tty_struct *tty, unsigned int cmd,
unsigned long arg) unsigned long arg)
{ {
struct fwtty_port *port = tty->driver_data; struct fwtty_port *port = tty->driver_data;
@ -1297,7 +1298,7 @@ static int fwtty_ioctl(struct tty_struct *tty, unsigned cmd,
static void fwtty_set_termios(struct tty_struct *tty, struct ktermios *old) static void fwtty_set_termios(struct tty_struct *tty, struct ktermios *old)
{ {
struct fwtty_port *port = tty->driver_data; struct fwtty_port *port = tty->driver_data;
unsigned baud; unsigned int baud;
spin_lock_bh(&port->lock); spin_lock_bh(&port->lock);
baud = set_termios(port, tty); baud = set_termios(port, tty);
@ -1369,7 +1370,7 @@ static int fwtty_break_ctl(struct tty_struct *tty, int state)
static int fwtty_tiocmget(struct tty_struct *tty) static int fwtty_tiocmget(struct tty_struct *tty)
{ {
struct fwtty_port *port = tty->driver_data; struct fwtty_port *port = tty->driver_data;
unsigned tiocm; unsigned int tiocm;
spin_lock_bh(&port->lock); spin_lock_bh(&port->lock);
tiocm = (port->mctrl & MCTRL_MASK) | (port->mstatus & ~MCTRL_MASK); tiocm = (port->mctrl & MCTRL_MASK) | (port->mstatus & ~MCTRL_MASK);
@ -1380,7 +1381,8 @@ static int fwtty_tiocmget(struct tty_struct *tty)
return tiocm; return tiocm;
} }
static int fwtty_tiocmset(struct tty_struct *tty, unsigned set, unsigned clear) static int fwtty_tiocmset(struct tty_struct *tty,
unsigned int set, unsigned int clear)
{ {
struct fwtty_port *port = tty->driver_data; struct fwtty_port *port = tty->driver_data;

42
drivers/staging/fwserial/fwserial.h
View File

@ -22,7 +22,7 @@
#ifdef FWTTY_PROFILING #ifdef FWTTY_PROFILING
#define DISTRIBUTION_MAX_SIZE 8192 #define DISTRIBUTION_MAX_SIZE 8192
#define DISTRIBUTION_MAX_INDEX (ilog2(DISTRIBUTION_MAX_SIZE) + 1) #define DISTRIBUTION_MAX_INDEX (ilog2(DISTRIBUTION_MAX_SIZE) + 1)
static inline void fwtty_profile_data(unsigned stat[], unsigned val) static inline void fwtty_profile_data(unsigned int stat[], unsigned int val)
{ {
int n = (val) ? min(ilog2(val) + 1, DISTRIBUTION_MAX_INDEX) : 0; int n = (val) ? min(ilog2(val) + 1, DISTRIBUTION_MAX_INDEX) : 0;
++stat[n]; ++stat[n];
@ -78,7 +78,7 @@ struct fwtty_peer {
u64 guid; u64 guid;
int generation; int generation;
int node_id; int node_id;
unsigned speed; unsigned int speed;
int max_payload; int max_payload;
u64 mgmt_addr; u64 mgmt_addr;
@ -160,17 +160,17 @@ struct fwserial_mgmt_pkt {
#define VIRT_CABLE_PLUG_TIMEOUT (60 * HZ) #define VIRT_CABLE_PLUG_TIMEOUT (60 * HZ)
struct stats { struct stats {
unsigned xchars; unsigned int xchars;
unsigned dropped; unsigned int dropped;
unsigned tx_stall; unsigned int tx_stall;
unsigned fifo_errs; unsigned int fifo_errs;
unsigned sent; unsigned int sent;
unsigned lost; unsigned int lost;
unsigned throttled; unsigned int throttled;
unsigned reads[DISTRIBUTION_MAX_INDEX + 1]; unsigned int reads[DISTRIBUTION_MAX_INDEX + 1];
unsigned writes[DISTRIBUTION_MAX_INDEX + 1]; unsigned int writes[DISTRIBUTION_MAX_INDEX + 1];
unsigned txns[DISTRIBUTION_MAX_INDEX + 1]; unsigned int txns[DISTRIBUTION_MAX_INDEX + 1];
unsigned unthrottle[DISTRIBUTION_MAX_INDEX + 1]; unsigned int unthrottle[DISTRIBUTION_MAX_INDEX + 1];
}; };
struct fwconsole_ops { struct fwconsole_ops {
@ -237,7 +237,7 @@ struct fwconsole_ops {
struct fwtty_port { struct fwtty_port {
struct tty_port port; struct tty_port port;
struct device *device; struct device *device;
unsigned index; unsigned int index;
struct fw_serial *serial; struct fw_serial *serial;
struct fw_address_handler rx_handler; struct fw_address_handler rx_handler;
@ -246,21 +246,21 @@ struct fwtty_port {
wait_queue_head_t wait_tx; wait_queue_head_t wait_tx;
struct delayed_work emit_breaks; struct delayed_work emit_breaks;
unsigned cps; unsigned int cps;
unsigned long break_last; unsigned long break_last;
struct work_struct hangup; struct work_struct hangup;
unsigned mstatus; unsigned int mstatus;
spinlock_t lock; spinlock_t lock;
unsigned mctrl; unsigned int mctrl;
struct delayed_work drain; struct delayed_work drain;
struct dma_fifo tx_fifo; struct dma_fifo tx_fifo;
int max_payload; int max_payload;
unsigned status_mask; unsigned int status_mask;
unsigned ignore_mask; unsigned int ignore_mask;
unsigned break_ctl:1, unsigned int break_ctl:1,
write_only:1, write_only:1,
overrun:1, overrun:1,
loopback:1; loopback:1;
@ -349,7 +349,7 @@ extern struct tty_driver *fwtty_driver;
* being used for isochronous traffic) * being used for isochronous traffic)
* 2) isochronous arbitration always wins. * 2) isochronous arbitration always wins.
*/ */
static inline int link_speed_to_max_payload(unsigned speed) static inline int link_speed_to_max_payload(unsigned int speed)
{ {
/* Max async payload is 4096 - see IEEE 1394-2008 tables 6-4, 16-18 */ /* Max async payload is 4096 - see IEEE 1394-2008 tables 6-4, 16-18 */
return min(512 << speed, 4096); return min(512 << speed, 4096);