Module Name: src
Committed By: christos
Date: Fri Jan 2 15:49:52 UTC 2015
Modified Files:
src/sys/arch/mac68k/obio: iwm_fd.c
Log Message:
name the flag ioctl argument "flag" like most other drivers.
To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 src/sys/arch/mac68k/obio/iwm_fd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mac68k/obio/iwm_fd.c
diff -u src/sys/arch/mac68k/obio/iwm_fd.c:1.52 src/sys/arch/mac68k/obio/iwm_fd.c:1.53
--- src/sys/arch/mac68k/obio/iwm_fd.c:1.52 Thu Jan 1 12:47:21 2015
+++ src/sys/arch/mac68k/obio/iwm_fd.c Fri Jan 2 10:49:51 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: iwm_fd.c,v 1.52 2015/01/01 17:47:21 christos Exp $ */
+/* $NetBSD: iwm_fd.c,v 1.53 2015/01/02 15:49:51 christos Exp $ */
/*
* Copyright (c) 1997, 1998 Hauke Fath. All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iwm_fd.c,v 1.52 2015/01/01 17:47:21 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iwm_fd.c,v 1.53 2015/01/02 15:49:51 christos Exp $");
#include "locators.h"
@@ -698,7 +698,7 @@ fdclose(dev_t dev, int flags, int devTyp
* we do not support them.
*/
int
-fdioctl(dev_t dev, u_long cmd, void *data, int flags, struct lwp *l)
+fdioctl(dev_t dev, u_long cmd, void *data, int flag, struct lwp *l)
{
int result, fdUnit, fdType;
fd_softc_t *fd;
@@ -729,7 +729,7 @@ fdioctl(dev_t dev, u_long cmd, void *dat
case DIOCSDINFO:
if (TRACE_IOCTL)
printf(" DIOCSDINFO: Set in-core disklabel.\n");
- result = ((flags & FWRITE) == 0) ? EBADF : 0;
+ result = ((flag & FWRITE) == 0) ? EBADF : 0;
if (result == 0)
result = setdisklabel(fd->diskInfo.dk_label,
(struct disklabel *)data, 0,
@@ -740,7 +740,7 @@ fdioctl(dev_t dev, u_long cmd, void *dat
if (TRACE_IOCTL)
printf(" DIOCWDINFO: Set in-core disklabel "
"& update disk.\n");
- result = ((flags & FWRITE) == 0) ? EBADF : 0;
+ result = ((flag & FWRITE) == 0) ? EBADF : 0;
if (result == 0)
result = setdisklabel(fd->diskInfo.dk_label,
@@ -779,7 +779,7 @@ fdioctl(dev_t dev, u_long cmd, void *dat
case DIOCWLABEL:
if (TRACE_IOCTL)
printf(" DIOCWLABEL: Set write access to disklabel.\n");
- result = ((flags & FWRITE) == 0) ? EBADF : 0;
+ result = ((flag & FWRITE) == 0) ? EBADF : 0;
if (result == 0)
fd->writeLabel = *(int *)data;
