Permalink
Browse files

kernel: Remove unused attributes from stuff that is, in fact, used.

  • Loading branch information...
1 parent 3323f1c commit b0dfaa52bd0221f4e25520df7c2faa02d0a57c7d Sascha Wildner committed Feb 16, 2012
@@ -33,7 +33,6 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* $FreeBSD: src/sys/dev/en/midway.c,v 1.19.2.1 2003/01/23 21:06:42 sam Exp $
- * $DragonFly: src/sys/dev/atm/en/midway.c,v 1.24 2008/03/01 22:03:13 swildner Exp $
*/
/*
@@ -245,28 +244,28 @@ STATIC void en_dmaprobe (struct en_softc *);
STATIC int en_dmaprobe_doit (struct en_softc *, u_int8_t *,
u_int8_t *, int);
STATIC INLINE int en_dqneed (struct en_softc *, caddr_t, u_int,
- u_int) __attribute__ ((unused));
+ u_int);
STATIC void en_init (struct en_softc *);
STATIC int en_ioctl (struct ifnet *, EN_IOCTL_CMDT, caddr_t,
struct ucred *);
-STATIC INLINE int en_k2sz (int) __attribute__ ((unused));
+STATIC INLINE int en_k2sz (int);
STATIC void en_loadvc (struct en_softc *, int);
STATIC int en_mfix (struct en_softc *, struct mbuf **,
struct mbuf *);
STATIC INLINE struct mbuf *en_mget (struct en_softc *, u_int,
- u_int *) __attribute__ ((unused));
+ u_int *);
STATIC INLINE u_int32_t en_read (struct en_softc *,
- u_int32_t) __attribute__ ((unused));
+ u_int32_t);
STATIC int en_rxctl (struct en_softc *, struct atm_pseudoioctl *,
int);
STATIC void en_txdma (struct en_softc *, int);
STATIC void en_txlaunch (struct en_softc *, int,
struct en_launch *);
STATIC void en_service (struct en_softc *);
STATIC void en_start (struct ifnet *);
-STATIC INLINE int en_sz2b (int) __attribute__ ((unused));
+STATIC INLINE int en_sz2b (int);
STATIC INLINE void en_write (struct en_softc *, u_int32_t,
- u_int32_t) __attribute__ ((unused));
+ u_int32_t);
/*
* macros/inline
@@ -309,7 +309,7 @@ void drm_rmmap(struct drm_device *dev, drm_local_map_t *map)
/* FALLTHROUGH */
case _DRM_FRAME_BUFFER:
if (map->mtrr) {
- int __unused retcode;
+ int retcode;
retcode = drm_mtrr_del(0, map->offset, map->size,
DRM_MTRR_WC);
@@ -498,7 +498,7 @@ static void drm_unload(struct drm_device *dev)
drm_ctxbitmap_cleanup(dev);
if (dev->agp && dev->agp->mtrr) {
- int __unused retcode;
+ int retcode;
retcode = drm_mtrr_del(0, dev->agp->info.ai_aperture_base,
dev->agp->info.ai_aperture_size, DRM_MTRR_WC);
@@ -124,7 +124,7 @@ static void amr_freecmd_cluster(struct amr_command_cluster *acc);
* Command processing.
*/
static int amr_bio_command(struct amr_softc *sc, struct amr_command **acp);
-static int amr_wait_command(struct amr_command *ac) __unused;
+static int amr_wait_command(struct amr_command *ac);
static int amr_mapcmd(struct amr_command *ac);
static void amr_unmapcmd(struct amr_command *ac);
static int amr_start(struct amr_command *ac);
@@ -288,7 +288,7 @@ mi_startup(void)
***************************************************************************
*/
static void
-print_caddr_t(void *data __unused)
+print_caddr_t(void *data)
{
kprintf("%s", (char *)data);
}
@@ -340,7 +340,7 @@ static prop_object_t
_prop_array_iterator_next_object(void *v)
{
struct _prop_array_iterator *pai = v;
- prop_array_t pa __unused = pai->pai_base.pi_obj;
+ prop_array_t pa = pai->pai_base.pi_obj;
prop_object_t po;
_PROP_ASSERT(prop_object_is_array(pa));
@@ -367,7 +367,7 @@ static void
_prop_array_iterator_reset(void *v)
{
struct _prop_array_iterator *pai = v;
- prop_array_t pa __unused = pai->pai_base.pi_obj;
+ prop_array_t pa = pai->pai_base.pi_obj;
_PROP_ASSERT(prop_object_is_array(pa));
@@ -628,7 +628,7 @@ static prop_object_t
_prop_dictionary_iterator_next_object(void *v)
{
struct _prop_dictionary_iterator *pdi = v;
- prop_dictionary_t pd __unused = pdi->pdi_base.pi_obj;
+ prop_dictionary_t pd = pdi->pdi_base.pi_obj;
prop_dictionary_keysym_t pdk;
_PROP_ASSERT(prop_object_is_dictionary(pd));
@@ -655,7 +655,7 @@ static void
_prop_dictionary_iterator_reset(void *v)
{
struct _prop_dictionary_iterator *pdi = v;
- prop_dictionary_t pd __unused = pdi->pdi_base.pi_obj;
+ prop_dictionary_t pd = pdi->pdi_base.pi_obj;
_PROP_RWLOCK_RDLOCK(pd->pd_rwlock);
_prop_dictionary_iterator_reset_locked(pdi);

0 comments on commit b0dfaa5

Please sign in to comment.