Commit 9c22f1bc authored by Linus Torvalds's avatar Linus Torvalds

Fix incorrect 'flags' usage pointed out by stricter type checking.

parent 81da5c11
...@@ -1479,7 +1479,8 @@ void print_all_local_APICs (void) ...@@ -1479,7 +1479,8 @@ void print_all_local_APICs (void)
void /*__init*/ print_PIC(void) void /*__init*/ print_PIC(void)
{ {
extern spinlock_t i8259A_lock; extern spinlock_t i8259A_lock;
unsigned int v, flags; unsigned int v;
unsigned long flags;
printk(KERN_DEBUG "\nprinting PIC contents\n"); printk(KERN_DEBUG "\nprinting PIC contents\n");
......
...@@ -281,7 +281,7 @@ acpi_bus_generate_event ( ...@@ -281,7 +281,7 @@ acpi_bus_generate_event (
int data) int data)
{ {
struct acpi_bus_event *event = NULL; struct acpi_bus_event *event = NULL;
u32 flags = 0; unsigned long flags = 0;
ACPI_FUNCTION_TRACE("acpi_bus_generate_event"); ACPI_FUNCTION_TRACE("acpi_bus_generate_event");
...@@ -314,7 +314,7 @@ int ...@@ -314,7 +314,7 @@ int
acpi_bus_receive_event ( acpi_bus_receive_event (
struct acpi_bus_event *event) struct acpi_bus_event *event)
{ {
u32 flags = 0; unsigned long flags = 0;
struct acpi_bus_event *entry = NULL; struct acpi_bus_event *entry = NULL;
DECLARE_WAITQUEUE(wait, current); DECLARE_WAITQUEUE(wait, current);
......
...@@ -815,7 +815,7 @@ void scsi_finish_command(Scsi_Cmnd * SCpnt) ...@@ -815,7 +815,7 @@ void scsi_finish_command(Scsi_Cmnd * SCpnt)
struct Scsi_Host *host; struct Scsi_Host *host;
Scsi_Device *device; Scsi_Device *device;
Scsi_Request * SRpnt; Scsi_Request * SRpnt;
unsigned int flags; unsigned long flags;
host = SCpnt->device->host; host = SCpnt->device->host;
device = SCpnt->device; device = SCpnt->device;
......
...@@ -336,7 +336,7 @@ void scsi_setup_cmd_retry(struct scsi_cmnd *cmd) ...@@ -336,7 +336,7 @@ void scsi_setup_cmd_retry(struct scsi_cmnd *cmd)
static void scsi_single_lun_run(struct scsi_device *current_sdev) static void scsi_single_lun_run(struct scsi_device *current_sdev)
{ {
struct scsi_device *sdev; struct scsi_device *sdev;
unsigned int flags, flags2; unsigned long flags, flags2;
spin_lock_irqsave(current_sdev->host->host_lock, flags); spin_lock_irqsave(current_sdev->host->host_lock, flags);
WARN_ON(!current_sdev->sdev_target->starget_sdev_user); WARN_ON(!current_sdev->sdev_target->starget_sdev_user);
...@@ -1155,7 +1155,7 @@ static void scsi_request_fn(request_queue_t *q) ...@@ -1155,7 +1155,7 @@ static void scsi_request_fn(request_queue_t *q)
struct Scsi_Host *shost = sdev->host; struct Scsi_Host *shost = sdev->host;
struct scsi_cmnd *cmd; struct scsi_cmnd *cmd;
struct request *req; struct request *req;
unsigned int flags; unsigned long flags;
/* /*
* To start with, we keep looping until the queue is empty, or until * To start with, we keep looping until the queue is empty, or until
......
...@@ -485,7 +485,7 @@ static struct scsi_device *scsi_alloc_sdev(struct Scsi_Host *shost, ...@@ -485,7 +485,7 @@ static struct scsi_device *scsi_alloc_sdev(struct Scsi_Host *shost,
**/ **/
static void scsi_free_sdev(struct scsi_device *sdev) static void scsi_free_sdev(struct scsi_device *sdev)
{ {
unsigned int flags; unsigned long flags;
list_del(&sdev->siblings); list_del(&sdev->siblings);
list_del(&sdev->same_target_siblings); list_del(&sdev->same_target_siblings);
...@@ -1142,7 +1142,7 @@ static int scsi_add_lun(Scsi_Device *sdev, Scsi_Request *sreq, ...@@ -1142,7 +1142,7 @@ static int scsi_add_lun(Scsi_Device *sdev, Scsi_Request *sreq,
{ {
struct scsi_device *sdev_sibling; struct scsi_device *sdev_sibling;
struct scsi_target *starget; struct scsi_target *starget;
unsigned int flags; unsigned long flags;
/* /*
* XXX do not save the inquiry, since it can change underneath us, * XXX do not save the inquiry, since it can change underneath us,
......
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