From 957f0e4e3b09db9514cd506c89c376a524c042c3 Mon Sep 17 00:00:00 2001 From: kmacy Date: Tue, 16 Sep 2008 02:28:08 +0000 Subject: [PATCH] Further whitespace and copyright cleanups to minimize the delta with RELENG_7. --- sys/dev/cxgb/cxgb_config.h | 1 - sys/dev/cxgb/cxgb_main.c | 4 ++-- sys/dev/cxgb/cxgb_offload.h | 2 +- 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 71a1475cc8ba..93840969c3b7 100644 --- a/sys/dev/cxgb/cxgb_config.h +++ b/sys/dev/cxgb/cxgb_config.h @@ -31,7 +31,6 @@ POSSIBILITY OF SUCH DAMAGE. ***************************************************************************/ #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 6ff907d8b3a6..39bd6f297eee 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 b8e0999585b2..a965afddaff7 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 a5acb001aae7..8f5404eaafc1 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(); \ } \