Sun Apr 24 18:54:41 2011 UTC ()

use static inline for ec_readmem(), it is not referenced elsewhere

(avoids C99 vs GNU semantics for external inline functions)


(plunky)

diff -r1.33 -r1.34 src/sys/dev/isa/if_ec.c

--- src/sys/dev/isa/if_ec.c 2008/04/28 20:23:52	1.33
+++ src/sys/dev/isa/if_ec.c 2011/04/24 18:54:41	1.34

 @@ -1,14 +1,14 @@
-/*	$NetBSD: if_ec.c,v 1.33 2008/04/28 20:23:52 martin Exp $	*/
+/*	$NetBSD: if_ec.c,v 1.34 2011/04/24 18:54:41 plunky Exp $	*/
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
 @@ -38,27 +38,27 @@
+ *
  * Copyright (C) 1993, David Greenman.  This software may be used, modified,
  * copied, distributed, and sold, in both source and binary form provided that
  * the above copyright and these terms are retained.  Under no circumstances is
  * the author responsible for the proper functioning of this software, nor does
  * the author assume any responsibility for damages incurred with its use.
  */
 /*
  * Device driver for the 3Com Etherlink II (3c503).
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.33 2008/04/28 20:23:52 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ec.c,v 1.34 2011/04/24 18:54:41 plunky Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/socket.h>
 #include <sys/mbuf.h>
 #include <sys/syslog.h>
 #include <net/if.h>
 #include <net/if_dl.h>
 #include <net/if_types.h>
 #include <net/if_media.h>
 @@ -96,28 +96,26 @@ int	ec_set_media(struct ec_softc *, int)
 void	ec_media_init(struct dp8390_softc *);
 int	ec_mediachange(struct dp8390_softc *);
 void	ec_mediastatus(struct dp8390_softc *, struct ifmediareq *);
 void	ec_init_card(struct dp8390_softc *);
 int	ec_write_mbuf(struct dp8390_softc *, struct mbuf *, int);
 int	ec_ring_copy(struct dp8390_softc *, int, void *, u_short);
 void	ec_read_hdr(struct dp8390_softc *, int, struct dp8390_ring *);
 int	ec_fake_test_mem(struct dp8390_softc *);
 int	ec_test_mem(struct dp8390_softc *);
 inline void ec_readmem(struct ec_softc *, int, u_int8_t *, int);
 static const int ec_iobase[] = {
 x2e0, 0x2a0, 0x280, 0x250, 0x350, 0x330, 0x310, 0x300,
 };
 #define	NEC_IOBASE	(sizeof(ec_iobase) / sizeof(ec_iobase[0]))
 static const int ec_membase[] = {
 	-1, -1, -1, -1,
 xc8000, 0xcc000, 0xd8000, 0xdc000,
 };
 #define	NEC_MEMBASE	(sizeof(ec_membase) / sizeof(ec_membase[0]))
 int
 ec_probe(device_t parent, cfdata_t match, void *aux)
 @@ -539,27 +537,27 @@ ec_test_mem(struct dp8390_softc *sc)
 	return (0);
  fail:
 	aprint_error_dev(sc->sc_dev,
 	    "failed to clear shared memory at offset 0x%x\n", i);
 	return (1);
+}
 /*
  * Given a NIC memory source address and a host memory destination address,
  * copy 'len' from NIC to host using shared memory.  The 'len' is rounded
  * up to a word - ok as long as mbufs are word-sized.
  */
-inline void
+static inline void
 ec_readmem(struct ec_softc *esc, int from, uint8_t *to, int len)
+{
 	bus_space_tag_t memt = esc->sc_dp8390.sc_buft;
 	bus_space_handle_t memh = esc->sc_dp8390.sc_bufh;
 	if (len & 1)
 		++len;
 	if (esc->sc_16bitp)
 		bus_space_read_region_2(memt, memh, from, (u_int16_t *)to,
 		    len >> 1);
 	else
 		bus_space_read_region_1(memt, memh, from, to, len);