From 9aa3283595451ca093500ff0977b106e1f465586 Mon Sep 17 00:00:00 2001 From: Jeff Kirsher Date: Fri, 13 May 2011 14:29:12 -0700 Subject: ehea/ibm*: Move the IBM drivers Move the IBM drivers into drivers/net/ethernet/ibm/ and make the necessary Kconfig and Makefile changes. - Renamed ibm_new_emac to emac - Cleaned up Makefile and Kconfig options which referred to IBM_NEW_EMAC to IBM_EMAC - ibmlana driver is a National Semiconductor SONIC driver so it was not moved CC: Christoph Raisch CC: Santiago Leon CC: Benjamin Herrenschmidt CC: David Gibson CC: Kyle Lucke CC: Michael Ellerman Signed-off-by: Jeff Kirsher --- drivers/net/ibm_newemac/debug.h | 83 ----------------------------------------- 1 file changed, 83 deletions(-) delete mode 100644 drivers/net/ibm_newemac/debug.h (limited to 'drivers/net/ibm_newemac/debug.h') diff --git a/drivers/net/ibm_newemac/debug.h b/drivers/net/ibm_newemac/debug.h deleted file mode 100644 index e596c77ccdf7..000000000000 --- a/drivers/net/ibm_newemac/debug.h +++ /dev/null @@ -1,83 +0,0 @@ -/* - * drivers/net/ibm_newemac/debug.h - * - * Driver for PowerPC 4xx on-chip ethernet controller, debug print routines. - * - * Copyright 2007 Benjamin Herrenschmidt, IBM Corp. - * - * - * Based on the arch/ppc version of the driver: - * - * Copyright (c) 2004, 2005 Zultys Technologies - * Eugene Surovegin or - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; either version 2 of the License, or (at your - * option) any later version. - * - */ -#ifndef __IBM_NEWEMAC_DEBUG_H -#define __IBM_NEWEMAC_DEBUG_H - -#include - -#include "core.h" - -#if defined(CONFIG_IBM_NEW_EMAC_DEBUG) - -struct emac_instance; -struct mal_instance; - -extern void emac_dbg_register(struct emac_instance *dev); -extern void emac_dbg_unregister(struct emac_instance *dev); -extern void mal_dbg_register(struct mal_instance *mal); -extern void mal_dbg_unregister(struct mal_instance *mal); -extern int emac_init_debug(void) __init; -extern void emac_fini_debug(void) __exit; -extern void emac_dbg_dump_all(void); - -# define DBG_LEVEL 1 - -#else - -# define emac_dbg_register(x) do { } while(0) -# define emac_dbg_unregister(x) do { } while(0) -# define mal_dbg_register(x) do { } while(0) -# define mal_dbg_unregister(x) do { } while(0) -# define emac_init_debug() do { } while(0) -# define emac_fini_debug() do { } while(0) -# define emac_dbg_dump_all() do { } while(0) - -# define DBG_LEVEL 0 - -#endif - -#define EMAC_DBG(d, name, fmt, arg...) \ - printk(KERN_DEBUG #name "%s: " fmt, d->ofdev->dev.of_node->full_name, ## arg) - -#if DBG_LEVEL > 0 -# define DBG(d,f,x...) EMAC_DBG(d, emac, f, ##x) -# define MAL_DBG(d,f,x...) EMAC_DBG(d, mal, f, ##x) -# define ZMII_DBG(d,f,x...) EMAC_DBG(d, zmii, f, ##x) -# define RGMII_DBG(d,f,x...) EMAC_DBG(d, rgmii, f, ##x) -# define NL "\n" -#else -# define DBG(f,x...) ((void)0) -# define MAL_DBG(d,f,x...) ((void)0) -# define ZMII_DBG(d,f,x...) ((void)0) -# define RGMII_DBG(d,f,x...) ((void)0) -#endif -#if DBG_LEVEL > 1 -# define DBG2(d,f,x...) DBG(d,f, ##x) -# define MAL_DBG2(d,f,x...) MAL_DBG(d,f, ##x) -# define ZMII_DBG2(d,f,x...) ZMII_DBG(d,f, ##x) -# define RGMII_DBG2(d,f,x...) RGMII_DBG(d,f, ##x) -#else -# define DBG2(f,x...) ((void)0) -# define MAL_DBG2(d,f,x...) ((void)0) -# define ZMII_DBG2(d,f,x...) ((void)0) -# define RGMII_DBG2(d,f,x...) ((void)0) -#endif - -#endif /* __IBM_NEWEMAC_DEBUG_H */ -- cgit v1.2.1