Commit 64b33619 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds

long vs. unsigned long - low-hanging fruits in drivers

deal with signedness of the stuff passed to set_bit() et.al.
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0cc0844b
...@@ -24,7 +24,7 @@ MODULE_DESCRIPTION("NatSemi SCx200 Driver"); ...@@ -24,7 +24,7 @@ MODULE_DESCRIPTION("NatSemi SCx200 Driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
unsigned scx200_gpio_base = 0; unsigned scx200_gpio_base = 0;
long scx200_gpio_shadow[2]; unsigned long scx200_gpio_shadow[2];
unsigned scx200_cb_base = 0; unsigned scx200_cb_base = 0;
......
...@@ -626,7 +626,7 @@ typedef struct { ...@@ -626,7 +626,7 @@ typedef struct {
struct amb_dev { struct amb_dev {
u8 irq; u8 irq;
long flags; unsigned long flags;
u32 iobase; u32 iobase;
u32 * membase; u32 * membase;
......
...@@ -423,7 +423,7 @@ struct hrz_dev { ...@@ -423,7 +423,7 @@ struct hrz_dev {
wait_queue_head_t tx_queue; wait_queue_head_t tx_queue;
u8 irq; u8 irq;
long flags; unsigned long flags;
u8 tx_last; u8 tx_last;
u8 tx_idle; u8 tx_idle;
......
...@@ -136,7 +136,7 @@ static int sizeof_bootstrap = 375; ...@@ -136,7 +136,7 @@ static int sizeof_bootstrap = 375;
static struct dsp56k_device { static struct dsp56k_device {
long in_use; unsigned long in_use;
long maxio, timeout; long maxio, timeout;
int tx_wsize, rx_wsize; int tx_wsize, rx_wsize;
} dsp56k; } dsp56k;
......
...@@ -99,7 +99,7 @@ struct Host { ...@@ -99,7 +99,7 @@ struct Host {
struct UnixRup UnixRups[MAX_RUP + LINKS_PER_UNIT]; struct UnixRup UnixRups[MAX_RUP + LINKS_PER_UNIT];
int timeout_id; /* For calling 100 ms delays */ int timeout_id; /* For calling 100 ms delays */
int timeout_sem; /* For calling 100 ms delays */ int timeout_sem; /* For calling 100 ms delays */
long locks; /* long req'd for set_bit --RR */ unsigned long locks; /* long req'd for set_bit --RR */
char ____end_marker____; char ____end_marker____;
}; };
#define Control CardP->DpControl #define Control CardP->DpControl
......
...@@ -71,7 +71,7 @@ struct riscom_port { ...@@ -71,7 +71,7 @@ struct riscom_port {
struct tty_struct * tty; struct tty_struct * tty;
int count; int count;
int blocked_open; int blocked_open;
long event; /* long req'd for set_bit --RR */ unsigned long event; /* long req'd for set_bit --RR */
int timeout; int timeout;
int close_delay; int close_delay;
unsigned char * xmit_buf; unsigned char * xmit_buf;
......
...@@ -27,7 +27,7 @@ struct sx_port { ...@@ -27,7 +27,7 @@ struct sx_port {
int c_dcd; int c_dcd;
struct sx_board *board; struct sx_board *board;
int line; int line;
long locks; unsigned long locks;
}; };
struct sx_board { struct sx_board {
...@@ -45,7 +45,7 @@ struct sx_board { ...@@ -45,7 +45,7 @@ struct sx_board {
int poll; int poll;
int ta_type; int ta_type;
struct timer_list timer; struct timer_list timer;
long locks; unsigned long locks;
}; };
struct vpd_prom { struct vpd_prom {
......
...@@ -91,7 +91,7 @@ typedef struct _fc_channel { ...@@ -91,7 +91,7 @@ typedef struct _fc_channel {
fcp_cmd *scsi_cmd_pool; fcp_cmd *scsi_cmd_pool;
char *scsi_rsp_pool; char *scsi_rsp_pool;
dma_addr_t dma_scsi_cmd, dma_scsi_rsp; dma_addr_t dma_scsi_cmd, dma_scsi_rsp;
long *scsi_bitmap; unsigned long *scsi_bitmap;
long scsi_bitmap_end; long scsi_bitmap_end;
int scsi_free; int scsi_free;
int (*encode_addr)(struct scsi_cmnd *, u16 *, struct _fc_channel *, fcp_cmnd *); int (*encode_addr)(struct scsi_cmnd *, u16 *, struct _fc_channel *, fcp_cmnd *);
......
...@@ -202,7 +202,7 @@ struct Layer1 { ...@@ -202,7 +202,7 @@ struct Layer1 {
void *hardware; void *hardware;
struct BCState *bcs; struct BCState *bcs;
struct PStack **stlistp; struct PStack **stlistp;
long Flags; unsigned long Flags;
struct FsmInst l1m; struct FsmInst l1m;
struct FsmTimer timer; struct FsmTimer timer;
void (*l1l2) (struct PStack *, int, void *); void (*l1l2) (struct PStack *, int, void *);
......
...@@ -56,7 +56,7 @@ struct hisax_d_if { ...@@ -56,7 +56,7 @@ struct hisax_d_if {
struct IsdnCardState *cs; struct IsdnCardState *cs;
struct hisax_b_if *b_if[2]; struct hisax_b_if *b_if[2];
struct sk_buff_head erq; struct sk_buff_head erq;
long ph_state; unsigned long ph_state;
}; };
int hisax_register(struct hisax_d_if *hisax_if, struct hisax_b_if *b_if[], int hisax_register(struct hisax_d_if *hisax_if, struct hisax_b_if *b_if[],
......
...@@ -183,7 +183,7 @@ static struct card { ...@@ -183,7 +183,7 @@ static struct card {
short addr_offset; short addr_offset;
unsigned char *vendor_id; unsigned char *vendor_id;
char *cardname; char *cardname;
long config; unsigned long config;
} cards[] = { } cards[] = {
{ {
.id0 = NI65_ID0, .id0 = NI65_ID0,
......
...@@ -154,8 +154,8 @@ struct cosa_data { ...@@ -154,8 +154,8 @@ struct cosa_data {
int nchannels; /* # of channels on this card */ int nchannels; /* # of channels on this card */
int driver_status; /* For communicating with firmware */ int driver_status; /* For communicating with firmware */
int firmware_status; /* Downloaded, reseted, etc. */ int firmware_status; /* Downloaded, reseted, etc. */
long int rxbitmap, txbitmap; /* Bitmap of channels who are willing to send/receive data */ unsigned long rxbitmap, txbitmap;/* Bitmap of channels who are willing to send/receive data */
long int rxtx; /* RX or TX in progress? */ unsigned long rxtx; /* RX or TX in progress? */
int enabled; int enabled;
int usage; /* usage count */ int usage; /* usage count */
int txchan, txsize, rxsize; int txchan, txsize, rxsize;
......
...@@ -661,7 +661,7 @@ struct local_info { ...@@ -661,7 +661,7 @@ struct local_info {
#define HOSTAP_BITS_TRANSMIT 0 #define HOSTAP_BITS_TRANSMIT 0
#define HOSTAP_BITS_BAP_TASKLET 1 #define HOSTAP_BITS_BAP_TASKLET 1
#define HOSTAP_BITS_BAP_TASKLET2 2 #define HOSTAP_BITS_BAP_TASKLET2 2
long bits; unsigned long bits;
struct ap_data *ap; struct ap_data *ap;
......
...@@ -33,8 +33,8 @@ typedef struct ray_dev_t { ...@@ -33,8 +33,8 @@ typedef struct ray_dev_t {
void __iomem *rmem; /* pointer to receive buffer window */ void __iomem *rmem; /* pointer to receive buffer window */
struct pcmcia_device *finder; /* pointer back to struct pcmcia_device for card */ struct pcmcia_device *finder; /* pointer back to struct pcmcia_device for card */
struct timer_list timer; struct timer_list timer;
long tx_ccs_lock; unsigned long tx_ccs_lock;
long ccs_lock; unsigned long ccs_lock;
int dl_param_ccs; int dl_param_ccs;
union { union {
struct b4_startup_params b4; struct b4_startup_params b4;
......
...@@ -197,7 +197,7 @@ struct agp_file_private { ...@@ -197,7 +197,7 @@ struct agp_file_private {
struct agp_file_private *next; struct agp_file_private *next;
struct agp_file_private *prev; struct agp_file_private *prev;
pid_t my_pid; pid_t my_pid;
long access_flags; /* long req'd for set_bit --RR */ unsigned long access_flags; /* long req'd for set_bit --RR */
}; };
struct agp_front_data { struct agp_front_data {
......
...@@ -200,7 +200,7 @@ struct hdlcdrv_state { ...@@ -200,7 +200,7 @@ struct hdlcdrv_state {
struct hdlcdrv_hdlcrx { struct hdlcdrv_hdlcrx {
struct hdlcdrv_hdlcbuffer hbuf; struct hdlcdrv_hdlcbuffer hbuf;
long in_hdlc_rx; unsigned long in_hdlc_rx;
/* 0 = sync hunt, != 0 receiving */ /* 0 = sync hunt, != 0 receiving */
int rx_state; int rx_state;
unsigned int bitstream; unsigned int bitstream;
......
u32 scx200_gpio_configure(unsigned index, u32 set, u32 clear); u32 scx200_gpio_configure(unsigned index, u32 set, u32 clear);
extern unsigned scx200_gpio_base; extern unsigned scx200_gpio_base;
extern long scx200_gpio_shadow[2]; extern unsigned long scx200_gpio_shadow[2];
extern struct nsc_gpio_ops scx200_gpio_ops; extern struct nsc_gpio_ops scx200_gpio_ops;
#define scx200_gpio_present() (scx200_gpio_base!=0) #define scx200_gpio_present() (scx200_gpio_base!=0)
...@@ -9,7 +9,7 @@ extern struct nsc_gpio_ops scx200_gpio_ops; ...@@ -9,7 +9,7 @@ extern struct nsc_gpio_ops scx200_gpio_ops;
/* Definitions to make sure I do the same thing in all functions */ /* Definitions to make sure I do the same thing in all functions */
#define __SCx200_GPIO_BANK unsigned bank = index>>5 #define __SCx200_GPIO_BANK unsigned bank = index>>5
#define __SCx200_GPIO_IOADDR unsigned short ioaddr = scx200_gpio_base+0x10*bank #define __SCx200_GPIO_IOADDR unsigned short ioaddr = scx200_gpio_base+0x10*bank
#define __SCx200_GPIO_SHADOW long *shadow = scx200_gpio_shadow+bank #define __SCx200_GPIO_SHADOW unsigned long *shadow = scx200_gpio_shadow+bank
#define __SCx200_GPIO_INDEX index &= 31 #define __SCx200_GPIO_INDEX index &= 31
#define __SCx200_GPIO_OUT __asm__ __volatile__("outsl":"=mS" (shadow):"d" (ioaddr), "0" (shadow)) #define __SCx200_GPIO_OUT __asm__ __volatile__("outsl":"=mS" (shadow):"d" (ioaddr), "0" (shadow))
...@@ -42,7 +42,7 @@ static inline void scx200_gpio_set_high(unsigned index) { ...@@ -42,7 +42,7 @@ static inline void scx200_gpio_set_high(unsigned index) {
__SCx200_GPIO_IOADDR; __SCx200_GPIO_IOADDR;
__SCx200_GPIO_SHADOW; __SCx200_GPIO_SHADOW;
__SCx200_GPIO_INDEX; __SCx200_GPIO_INDEX;
set_bit(index, shadow); set_bit(index, shadow); /* __set_bit()? */
__SCx200_GPIO_OUT; __SCx200_GPIO_OUT;
} }
...@@ -53,7 +53,7 @@ static inline void scx200_gpio_set_low(unsigned index) { ...@@ -53,7 +53,7 @@ static inline void scx200_gpio_set_low(unsigned index) {
__SCx200_GPIO_IOADDR; __SCx200_GPIO_IOADDR;
__SCx200_GPIO_SHADOW; __SCx200_GPIO_SHADOW;
__SCx200_GPIO_INDEX; __SCx200_GPIO_INDEX;
clear_bit(index, shadow); clear_bit(index, shadow); /* __clear_bit()? */
__SCx200_GPIO_OUT; __SCx200_GPIO_OUT;
} }
......
...@@ -75,7 +75,7 @@ struct stlport { ...@@ -75,7 +75,7 @@ struct stlport {
int ioaddr; int ioaddr;
int uartaddr; int uartaddr;
unsigned int pagenr; unsigned int pagenr;
long istate; unsigned long istate;
int flags; int flags;
int baud_base; int baud_base;
int custom_divisor; int custom_divisor;
......
...@@ -157,7 +157,7 @@ struct snd_bt87x { ...@@ -157,7 +157,7 @@ struct snd_bt87x {
int dig_rate; int dig_rate;
spinlock_t reg_lock; spinlock_t reg_lock;
long opened; unsigned long opened;
struct snd_pcm_substream *substream; struct snd_pcm_substream *substream;
struct snd_dma_buffer dma_risc; struct snd_dma_buffer dma_risc;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment