diff options
| author | kmacy <kmacy@FreeBSD.org> | 2008-09-16 02:28:08 +0000 |
|---|---|---|
| committer | kmacy <kmacy@FreeBSD.org> | 2008-09-16 02:28:08 +0000 |
| commit | 957f0e4e3b09db9514cd506c89c376a524c042c3 (patch) | |
| tree | d5af0aab05a14efab4a8e8db9613b18ae803a229 /sys | |
| parent | 00a3b87a5a88883f5cae1103178737c0d99c1220 (diff) | |
| download | FreeBSD-src-957f0e4e3b09db9514cd506c89c376a524c042c3.zip FreeBSD-src-957f0e4e3b09db9514cd506c89c376a524c042c3.tar.gz | |
Further whitespace and copyright cleanups to minimize the
delta with RELENG_7.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/dev/cxgb/cxgb_config.h | 1 | ||||
| -rw-r--r-- | sys/dev/cxgb/cxgb_main.c | 4 | ||||
| -rw-r--r-- | sys/dev/cxgb/cxgb_offload.h | 2 | ||||
| -rw-r--r-- | sys/dev/cxgb/cxgb_osdep.h | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/sys/dev/cxgb/cxgb_config.h b/sys/dev/cxgb/cxgb_config.h index 71a1475..9384096 100644 --- a/sys/dev/cxgb/cxgb_config.h +++ b/sys/dev/cxgb/cxgb_config.h @@ -31,7 +31,6 @@ $FreeBSD$ ***************************************************************************/ #ifndef _CXGB_CONFIG_H_ #define _CXGB_CONFIG_H_ - #ifndef CONFIG_DEFINED #define CONFIG_CHELSIO_T3_CORE #endif diff --git a/sys/dev/cxgb/cxgb_main.c b/sys/dev/cxgb/cxgb_main.c index 6ff907d..39bd6f2 100644 --- a/sys/dev/cxgb/cxgb_main.c +++ b/sys/dev/cxgb/cxgb_main.c @@ -334,7 +334,7 @@ cxgb_get_adapter_info(device_t dev) { struct cxgb_ident *id; const struct adapter_info *ai; - + id = cxgb_get_ident(dev); if (id == NULL) return (NULL); @@ -351,7 +351,7 @@ cxgb_controller_probe(device_t dev) char *ports, buf[80]; int nports; struct adapter *sc = device_get_softc(dev); - + ai = cxgb_get_adapter_info(dev); if (ai == NULL) return (ENXIO); diff --git a/sys/dev/cxgb/cxgb_offload.h b/sys/dev/cxgb/cxgb_offload.h index b8e0999..a965afd 100644 --- a/sys/dev/cxgb/cxgb_offload.h +++ b/sys/dev/cxgb/cxgb_offload.h @@ -1,7 +1,7 @@ /************************************************************************** -Copyright (c) 2007, Chelsio Inc. +Copyright (c) 2007-2008, Chelsio Inc. All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/cxgb/cxgb_osdep.h b/sys/dev/cxgb/cxgb_osdep.h index a5acb00..8f5404e 100644 --- a/sys/dev/cxgb/cxgb_osdep.h +++ b/sys/dev/cxgb/cxgb_osdep.h @@ -169,7 +169,7 @@ void prefetch(void *x) extern void kdb_backtrace(void); #define WARN_ON(condition) do { \ - if (__predict_false((condition)!=0)) { \ + if (__predict_false((condition)!=0)) { \ log(LOG_WARNING, "BUG: warning at %s:%d/%s()\n", __FILE__, __LINE__, __FUNCTION__); \ kdb_backtrace(); \ } \ |
