[src/trunk]: src/sys/arch make fd.c's fd_dev_to_type() always a static inli...

To: source-changes-hg%NetBSD.org@localhost
Subject: [src/trunk]: src/sys/arch make *fd*.c's fd_dev_to_type() always a static inli...
From: mrg <mrg%NetBSD.org@localhost>
Date: Fri, 08 Feb 2019 12:10:56 +0000
details:   https://anonhg.NetBSD.org/src/rev/7513d00ee491
branches:  trunk
changeset: 448746:7513d00ee491
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Feb 08 08:47:35 2019 +0000

description:
make *fd*.c's fd_dev_to_type() always a static inline.  some
have it as a const, and have code to copy the defaults to
modify them before using them, but that probably requires a
real test to feel confident in changing.

diffstat:

 sys/arch/acorn32/mainbus/fd.c |  8 ++++----
 sys/arch/arc/jazz/fd.c        |  8 ++++----
 sys/arch/atari/dev/hdfd.c     |  8 ++++----
 sys/arch/sparc/dev/fd.c       |  8 ++++----
 sys/arch/sparc64/dev/fdc.c    |  8 ++++----
 sys/arch/sun3/dev/fd.c        |  8 ++++----
 sys/arch/x68k/dev/fd.c        |  8 ++++----
 7 files changed, 28 insertions(+), 28 deletions(-)

diffs (252 lines):

diff -r 22b7a5c0a6a9 -r 7513d00ee491 sys/arch/acorn32/mainbus/fd.c
--- a/sys/arch/acorn32/mainbus/fd.c     Fri Feb 08 08:41:11 2019 +0000
+++ b/sys/arch/acorn32/mainbus/fd.c     Fri Feb 08 08:47:35 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fd.c,v 1.59 2018/09/03 16:29:22 riastradh Exp $        */
+/*     $NetBSD: fd.c,v 1.60 2019/02/08 08:47:35 mrg Exp $      */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -82,7 +82,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.59 2018/09/03 16:29:22 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.60 2019/02/08 08:47:35 mrg Exp $");
 
 #include "opt_ddb.h"
 
@@ -313,7 +313,7 @@
 int fdcintr(void *);
 void fdcretry(struct fdc_softc *fdc);
 void fdfinish(struct fd_softc *fd, struct buf *bp);
-inline struct fd_type *fd_dev_to_type(struct fd_softc *, dev_t);
+static struct fd_type *fd_dev_to_type(struct fd_softc *, dev_t);
 int fdformat(dev_t, struct ne7_fd_formb *, struct lwp *);
 
 int
@@ -554,7 +554,7 @@
        }
 }
 
-inline struct fd_type *
+static struct fd_type *
 fd_dev_to_type(struct fd_softc *fd, dev_t dev)
 {
        int type = FDTYPE(dev);
diff -r 22b7a5c0a6a9 -r 7513d00ee491 sys/arch/arc/jazz/fd.c
--- a/sys/arch/arc/jazz/fd.c    Fri Feb 08 08:41:11 2019 +0000
+++ b/sys/arch/arc/jazz/fd.c    Fri Feb 08 08:47:35 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fd.c,v 1.48 2018/09/03 16:29:23 riastradh Exp $        */
+/*     $NetBSD: fd.c,v 1.49 2019/02/08 08:47:35 mrg Exp $      */
 /*     $OpenBSD: fd.c,v 1.6 1998/10/03 21:18:57 millert Exp $  */
 /*     NetBSD: fd.c,v 1.78 1995/07/04 07:23:09 mycroft Exp     */
 
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.48 2018/09/03 16:29:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.49 2019/02/08 08:47:35 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -232,7 +232,7 @@
 static void fdcpseudointr(void *);
 static void fdcretry(struct fdc_softc *);
 static void fdfinish(struct fd_softc *, struct buf *);
-static inline const struct fd_type *fd_dev_to_type(struct fd_softc *, dev_t);
+static const struct fd_type *fd_dev_to_type(struct fd_softc *, dev_t);
 static void fd_mountroot_hook(device_t);
 
 /*
@@ -419,7 +419,7 @@
 }
 #endif
 
-static inline const struct fd_type *
+static const struct fd_type *
 fd_dev_to_type(struct fd_softc *fd, dev_t dev)
 {
        int type = FDTYPE(dev);
diff -r 22b7a5c0a6a9 -r 7513d00ee491 sys/arch/atari/dev/hdfd.c
--- a/sys/arch/atari/dev/hdfd.c Fri Feb 08 08:41:11 2019 +0000
+++ b/sys/arch/atari/dev/hdfd.c Fri Feb 08 08:47:35 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: hdfd.c,v 1.83 2018/09/03 16:29:24 riastradh Exp $      */
+/*     $NetBSD: hdfd.c,v 1.84 2019/02/08 08:47:35 mrg Exp $    */
 
 /*-
  * Copyright (c) 1996 Leo Weppelman
@@ -91,7 +91,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.83 2018/09/03 16:29:24 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hdfd.c,v 1.84 2019/02/08 08:47:35 mrg Exp $");
 
 #include "opt_ddb.h"
 
@@ -335,7 +335,7 @@
 static void    fdgetdisklabel(struct fd_softc *, dev_t);
 static void    fdgetdefaultlabel(struct fd_softc *, struct disklabel *, int);
 
-inline struct fd_type *fd_dev_to_type(struct fd_softc *, dev_t);
+static struct fd_type *fd_dev_to_type(struct fd_softc *, dev_t);
 
 int
 fdcprobe(device_t parent, cfdata_t cf, void *aux)
@@ -592,7 +592,7 @@
        }
 }
 
-inline struct fd_type *
+static struct fd_type *
 fd_dev_to_type(struct fd_softc *fd, dev_t dev)
 {
        int type = FDTYPE(dev);
diff -r 22b7a5c0a6a9 -r 7513d00ee491 sys/arch/sparc/dev/fd.c
--- a/sys/arch/sparc/dev/fd.c   Fri Feb 08 08:41:11 2019 +0000
+++ b/sys/arch/sparc/dev/fd.c   Fri Feb 08 08:47:35 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fd.c,v 1.158 2018/09/03 16:29:27 riastradh Exp $       */
+/*     $NetBSD: fd.c,v 1.159 2019/02/08 08:47:35 mrg Exp $     */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.158 2018/09/03 16:29:27 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.159 2019/02/08 08:47:35 mrg Exp $");
 
 #include "opt_ddb.h"
 #include "opt_md.h"
@@ -225,7 +225,7 @@
 CFATTACH_DECL_NEW(fdc_obio, sizeof(struct fdc_softc),
     fdcmatch_obio, fdcattach_obio, NULL, NULL);
 
-inline struct fd_type *fd_dev_to_type(struct fd_softc *, dev_t);
+static struct fd_type *fd_dev_to_type(struct fd_softc *, dev_t);
 
 /*
  * Floppies come in various flavors, e.g., 1.2MB vs 1.44MB; here is how
@@ -839,7 +839,7 @@
 }
 
 
-inline struct fd_type *
+static struct fd_type *
 fd_dev_to_type(struct fd_softc *fd, dev_t dev)
 {
        int type = FDTYPE(dev);
diff -r 22b7a5c0a6a9 -r 7513d00ee491 sys/arch/sparc64/dev/fdc.c
--- a/sys/arch/sparc64/dev/fdc.c        Fri Feb 08 08:41:11 2019 +0000
+++ b/sys/arch/sparc64/dev/fdc.c        Fri Feb 08 08:47:35 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fdc.c,v 1.46 2019/02/05 06:10:53 mrg Exp $     */
+/*     $NetBSD: fdc.c,v 1.47 2019/02/08 08:47:35 mrg Exp $     */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -101,7 +101,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fdc.c,v 1.46 2019/02/05 06:10:53 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdc.c,v 1.47 2019/02/08 08:47:35 mrg Exp $");
 
 #include "opt_ddb.h"
 #include "opt_md.h"
@@ -257,7 +257,7 @@
     fdcmatch_ebus, fdcattach_ebus, NULL, NULL);
 #endif
 
-static inline struct fd_type *fd_dev_to_type(struct fd_softc *, dev_t);
+static struct fd_type *fd_dev_to_type(struct fd_softc *, dev_t);
 
 /*
  * Floppies come in various flavors, e.g., 1.2MB vs 1.44MB; here is how
@@ -1012,7 +1012,7 @@
 }
 
 
-static inline struct fd_type *
+static struct fd_type *
 fd_dev_to_type(struct fd_softc *fd, dev_t dev)
 {
        int type = FDTYPE(dev);
diff -r 22b7a5c0a6a9 -r 7513d00ee491 sys/arch/sun3/dev/fd.c
--- a/sys/arch/sun3/dev/fd.c    Fri Feb 08 08:41:11 2019 +0000
+++ b/sys/arch/sun3/dev/fd.c    Fri Feb 08 08:47:35 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fd.c,v 1.81 2018/09/03 16:29:28 riastradh Exp $        */
+/*     $NetBSD: fd.c,v 1.82 2019/02/08 08:47:35 mrg Exp $      */
 
 /*-
  * Copyright (c) 1990 The Regents of the University of California.
@@ -72,7 +72,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.81 2018/09/03 16:29:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.82 2019/02/08 08:47:35 mrg Exp $");
 
 #include "opt_ddb.h"
 
@@ -191,7 +191,7 @@
 CFATTACH_DECL_NEW(fdc, sizeof(struct fdc_softc),
     fdcmatch, fdcattach, NULL, NULL);
 
-static inline struct fd_type *fd_dev_to_type(struct fd_softc *, dev_t);
+static struct fd_type *fd_dev_to_type(struct fd_softc *, dev_t);
 
 /*
  * Floppies come in various flavors, e.g., 1.2MB vs 1.44MB; here is how
@@ -644,7 +644,7 @@
        return true;
 }
 
-static inline struct fd_type *
+static struct fd_type *
 fd_dev_to_type(struct fd_softc *fd, dev_t dev)
 {
        int type = FDTYPE(dev);
diff -r 22b7a5c0a6a9 -r 7513d00ee491 sys/arch/x68k/dev/fd.c
--- a/sys/arch/x68k/dev/fd.c    Fri Feb 08 08:41:11 2019 +0000
+++ b/sys/arch/x68k/dev/fd.c    Fri Feb 08 08:47:35 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fd.c,v 1.121 2018/09/03 16:29:28 riastradh Exp $       */
+/*     $NetBSD: fd.c,v 1.122 2019/02/08 08:47:35 mrg Exp $     */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -64,7 +64,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.121 2018/09/03 16:29:28 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fd.c,v 1.122 2019/02/08 08:47:35 mrg Exp $");
 
 #include "opt_ddb.h"
 #include "opt_m68k_arch.h"
@@ -315,7 +315,7 @@
 void fdcpseudointr(void *);
 void fdcretry(struct fdc_softc *);
 void fdfinish(struct fd_softc *, struct buf *);
-struct fd_type *fd_dev_to_type(struct fd_softc *, dev_t);
+static struct fd_type *fd_dev_to_type(struct fd_softc *, dev_t);
 int fdformat(dev_t, struct ne7_fd_formb *, struct lwp *);
 static int fdcpoll(struct fdc_softc *);
 static int fdgetdisklabel(struct fd_softc *, dev_t);
@@ -670,7 +670,7 @@
            RND_TYPE_DISK, RND_FLAG_DEFAULT);
 }
 
-struct fd_type *
+static struct fd_type *
 fd_dev_to_type(struct fd_softc *fd, dev_t dev)
 {
        size_t type = FDTYPE(dev);
Prev by Date: [src/trunk]: src/usr.sbin/memswitch Make compilable even SRAMDEBUG.
Next by Date: [src/trunk]: src/etc/mtree add final missing directory from /usr/include:
Previous by Thread: [src/trunk]: src/usr.sbin/memswitch Make compilable even SRAMDEBUG.
Next by Thread: [src/trunk]: src/etc/mtree add final missing directory from /usr/include:
Indexes:
Home | Main Index | Thread Index | Old Index
[src/trunk]: src/sys/arch make *fd*.c's fd_dev_to_type() always a static inli...

[src/trunk]: src/sys/arch make fd.c's fd_dev_to_type() always a static inli...
