Skip to content

Commit

Permalink
drivers/block/floppy.c: convert int 1/0 to bool true/false
Browse files Browse the repository at this point in the history 
Various functions use int where bool is appropriate
lock_fdc, wait_til_done, poll_drive, user_reset_fdc

Convert to bool.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Stephen Hemminger <shemminger@vyatta.com>
Cc: Jens Axboe <jens.axboe@oracle.com>
Cc: Marcin Slusarz <marcin.slusarz@gmail.com>
Cc: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Joe Perches authored and Linus Torvalds committed Mar 12, 2010
1 parent 55eee80 commit 74f63f4
Showing 1 changed file with 30 additions and 30 deletions.
60 changes: 30 additions & 30 deletions drivers/block/floppy.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -862,7 +862,7 @@ static void set_fdc(int drive)
}

/* locks the driver */
static int _lock_fdc(int drive, int interruptible, int line)
static int _lock_fdc(int drive, bool interruptible, int line)
{
if (!usage_count) {
pr_err("Trying to lock fdc while usage count=0 at line %d\n",
Expand Down Expand Up @@ -2021,7 +2021,7 @@ static struct cont_t intr_cont = {
.done = (done_f)empty
};

static int wait_til_done(void (*handler)(void), int interruptible)
static int wait_til_done(void (*handler)(void), bool interruptible)
{
int ret;

Expand Down Expand Up @@ -2247,7 +2247,7 @@ static int do_format(int drive, struct format_descr *tmp_format_req)
{
int ret;

if (lock_fdc(drive, 1))
if (lock_fdc(drive, true))
return -EINTR;

set_floppy(drive);
Expand All @@ -2264,7 +2264,7 @@ static int do_format(int drive, struct format_descr *tmp_format_req)
format_errors = 0;
cont = &format_cont;
errors = &format_errors;
ret = wait_til_done(redo_format, 1);
ret = wait_til_done(redo_format, true);
if (ret == -EINTR)
return -EINTR;
process_fd_request();
Expand Down Expand Up @@ -2980,7 +2980,7 @@ static void do_fd_request(struct request_queue *q)
is_alive("do fd request, old request running");
return;
}
lock_fdc(MAXTIMEOUT, 0);
lock_fdc(MAXTIMEOUT, false);
process_fd_request();
is_alive("do fd request");
}
Expand All @@ -2992,7 +2992,7 @@ static struct cont_t poll_cont = {
.done = generic_done
};

static int poll_drive(int interruptible, int flag)
static int poll_drive(bool interruptible, int flag)
{
/* no auto-sense, just clear dcl */
raw_cmd = &default_raw_cmd;
Expand Down Expand Up @@ -3023,7 +3023,7 @@ static struct cont_t reset_cont = {
.done = generic_done
};

static int user_reset_fdc(int drive, int arg, int interruptible)
static int user_reset_fdc(int drive, int arg, bool interruptible)
{
int ret;

Expand Down Expand Up @@ -3265,7 +3265,7 @@ static int raw_cmd_ioctl(int cmd, void __user *param)

raw_cmd = my_raw_cmd;
cont = &raw_cmd_cont;
ret = wait_til_done(floppy_start, 1);
ret = wait_til_done(floppy_start, true);
debug_dcl(DP->flags, "calling disk change from raw_cmd ioctl\n");

if (ret != -EINTR && FDCS->reset)
Expand Down Expand Up @@ -3305,7 +3305,7 @@ static inline int set_geometry(unsigned int cmd, struct floppy_struct *g,
if (!capable(CAP_SYS_ADMIN))
return -EPERM;
mutex_lock(&open_lock);
if (lock_fdc(drive, 1)) {
if (lock_fdc(drive, true)) {
mutex_unlock(&open_lock);
return -EINTR;
}
Expand All @@ -3325,12 +3325,12 @@ static inline int set_geometry(unsigned int cmd, struct floppy_struct *g,
} else {
int oldStretch;

if (lock_fdc(drive, 1))
if (lock_fdc(drive, true))
return -EINTR;
if (cmd != FDDEFPRM) {
/* notice a disk change immediately, else
* we lose our settings immediately*/
if (poll_drive(1, FD_RAW_NEED_DISK) == -EINTR)
if (poll_drive(true, FD_RAW_NEED_DISK) == -EINTR)
return -EINTR;
}
oldStretch = g->stretch;
Expand Down Expand Up @@ -3411,9 +3411,9 @@ static int get_floppy_geometry(int drive, int type, struct floppy_struct **g)
if (type)
*g = &floppy_type[type];
else {
if (lock_fdc(drive, 0))
if (lock_fdc(drive, false))
return -EINTR;
if (poll_drive(0, 0) == -EINTR)
if (poll_drive(false, 0) == -EINTR)
return -EINTR;
process_fd_request();
*g = current_type[drive];
Expand Down Expand Up @@ -3497,7 +3497,7 @@ static int fd_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd,
if (UDRS->fd_ref != 1)
/* somebody else has this drive open */
return -EBUSY;
if (lock_fdc(drive, 1))
if (lock_fdc(drive, true))
return -EINTR;

/* do the actual eject. Fails on
Expand All @@ -3509,7 +3509,7 @@ static int fd_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd,
process_fd_request();
return ret;
case FDCLRPRM:
if (lock_fdc(drive, 1))
if (lock_fdc(drive, true))
return -EINTR;
current_type[drive] = NULL;
floppy_sizes[drive] = MAX_DISK_SIZE << 1;
Expand All @@ -3532,9 +3532,9 @@ static int fd_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd,
UDP->flags &= ~FTD_MSG;
return 0;
case FDFMTBEG:
if (lock_fdc(drive, 1))
if (lock_fdc(drive, true))
return -EINTR;
if (poll_drive(1, FD_RAW_NEED_DISK) == -EINTR)
if (poll_drive(true, FD_RAW_NEED_DISK) == -EINTR)
return -EINTR;
ret = UDRS->flags;
process_fd_request();
Expand All @@ -3549,7 +3549,7 @@ static int fd_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd,
return do_format(drive, &inparam.f);
case FDFMTEND:
case FDFLUSH:
if (lock_fdc(drive, 1))
if (lock_fdc(drive, true))
return -EINTR;
return invalidate_drive(bdev);
case FDSETEMSGTRESH:
Expand All @@ -3572,17 +3572,17 @@ static int fd_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd,
outparam = (const char *)UDP;
break;
case FDPOLLDRVSTAT:
if (lock_fdc(drive, 1))
if (lock_fdc(drive, true))
return -EINTR;
if (poll_drive(1, FD_RAW_NEED_DISK) == -EINTR)
if (poll_drive(true, FD_RAW_NEED_DISK) == -EINTR)
return -EINTR;
process_fd_request();
/* fall through */
case FDGETDRVSTAT:
outparam = (const char *)UDRS;
break;
case FDRESET:
return user_reset_fdc(drive, (int)param, 1);
return user_reset_fdc(drive, (int)param, true);
case FDGETFDCSTAT:
outparam = (const char *)UFDCS;
break;
Expand All @@ -3595,7 +3595,7 @@ static int fd_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd,
case FDRAWCMD:
if (type)
return -EINVAL;
if (lock_fdc(drive, 1))
if (lock_fdc(drive, true))
return -EINTR;
set_floppy(drive);
i = raw_cmd_ioctl(cmd, (void __user *)param);
Expand All @@ -3604,7 +3604,7 @@ static int fd_ioctl(struct block_device *bdev, fmode_t mode, unsigned int cmd,
process_fd_request();
return i;
case FDTWADDLE:
if (lock_fdc(drive, 1))
if (lock_fdc(drive, true))
return -EINTR;
twaddle();
process_fd_request();
Expand Down Expand Up @@ -3803,8 +3803,8 @@ static int check_floppy_change(struct gendisk *disk)
return 1;

if (time_after(jiffies, UDRS->last_checked + UDP->checkfreq)) {
lock_fdc(drive, 0);
poll_drive(0, 0);
lock_fdc(drive, false);
poll_drive(false, 0);
process_fd_request();
}

Expand Down Expand Up @@ -3887,7 +3887,7 @@ static int floppy_revalidate(struct gendisk *disk)
pr_info("VFS: revalidate called on non-open device.\n");
return -EFAULT;
}
lock_fdc(drive, 0);
lock_fdc(drive, false);
cf = (test_bit(FD_DISK_CHANGED_BIT, &UDRS->flags) ||
test_bit(FD_VERIFY_BIT, &UDRS->flags));
if (!(cf || test_bit(drive, &fake_change) || NO_GEOM)) {
Expand All @@ -3907,7 +3907,7 @@ static int floppy_revalidate(struct gendisk *disk)
res = __floppy_read_block_0(opened_bdev[drive]);
} else {
if (cf)
poll_drive(0, FD_RAW_NEED_DISK);
poll_drive(false, FD_RAW_NEED_DISK);
process_fd_request();
}
}
Expand Down Expand Up @@ -4164,7 +4164,7 @@ static int floppy_resume(struct device *dev)

for (fdc = 0; fdc < N_FDC; fdc++)
if (FDCS->address != -1)
user_reset_fdc(-1, FD_RESET_ALWAYS, 0);
user_reset_fdc(-1, FD_RESET_ALWAYS, false);

return 0;
}
Expand Down Expand Up @@ -4311,7 +4311,7 @@ static int __init floppy_init(void)
if (FDCS->address == -1)
continue;
FDCS->rawcmd = 2;
if (user_reset_fdc(-1, FD_RESET_ALWAYS, 0)) {
if (user_reset_fdc(-1, FD_RESET_ALWAYS, false)) {
/* free ioports reserved by floppy_grab_irq_and_dma() */
floppy_release_regions(fdc);
FDCS->address = -1;
Expand All @@ -4334,7 +4334,7 @@ static int __init floppy_init(void)
* properly, so force a reset for the standard FDC clones,
* to avoid interrupt garbage.
*/
user_reset_fdc(-1, FD_RESET_ALWAYS, 0);
user_reset_fdc(-1, FD_RESET_ALWAYS, false);
}
fdc = 0;
del_timer(&fd_timeout);
Expand Down

0 comments on commit 74f63f4

Please sign in to comment.