 cd354f1ae7
			
		
	
	
	cd354f1ae7
	
	
	
		
			
			After Al Viro (finally) succeeded in removing the sched.h #include in module.h recently, it makes sense again to remove other superfluous sched.h includes. There are quite a lot of files which include it but don't actually need anything defined in there. Presumably these includes were once needed for macros that used to live in sched.h, but moved to other header files in the course of cleaning it up. To ease the pain, this time I did not fiddle with any header files and only removed #includes from .c-files, which tend to cause less trouble. Compile tested against 2.6.20-rc2 and 2.6.20-rc2-mm2 (with offsets) on alpha, arm, i386, ia64, mips, powerpc, and x86_64 with allnoconfig, defconfig, allmodconfig, and allyesconfig as well as a few randconfigs on x86_64 and all configs in arch/arm/configs on arm. I also checked that no new warnings were introduced by the patch (actually, some warnings are removed that were emitted by unnecessarily included header files). Signed-off-by: Tim Schmielau <tim@physik3.uni-rostock.de> Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
		
			
				
	
	
		
			161 lines
		
	
	
	
		
			3.9 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			161 lines
		
	
	
	
		
			3.9 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * drivers/net/phy/cicada.c
 | |
|  *
 | |
|  * Driver for Cicada PHYs
 | |
|  *
 | |
|  * Author: Andy Fleming
 | |
|  *
 | |
|  * Copyright (c) 2004 Freescale Semiconductor, Inc.
 | |
|  *
 | |
|  * 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.
 | |
|  *
 | |
|  */
 | |
| #include <linux/kernel.h>
 | |
| #include <linux/string.h>
 | |
| #include <linux/errno.h>
 | |
| #include <linux/unistd.h>
 | |
| #include <linux/slab.h>
 | |
| #include <linux/interrupt.h>
 | |
| #include <linux/init.h>
 | |
| #include <linux/delay.h>
 | |
| #include <linux/netdevice.h>
 | |
| #include <linux/etherdevice.h>
 | |
| #include <linux/skbuff.h>
 | |
| #include <linux/spinlock.h>
 | |
| #include <linux/mm.h>
 | |
| #include <linux/module.h>
 | |
| #include <linux/mii.h>
 | |
| #include <linux/ethtool.h>
 | |
| #include <linux/phy.h>
 | |
| 
 | |
| #include <asm/io.h>
 | |
| #include <asm/irq.h>
 | |
| #include <asm/uaccess.h>
 | |
| 
 | |
| /* Cicada Extended Control Register 1 */
 | |
| #define MII_CIS8201_EXT_CON1           0x17
 | |
| #define MII_CIS8201_EXTCON1_INIT       0x0000
 | |
| 
 | |
| /* Cicada Interrupt Mask Register */
 | |
| #define MII_CIS8201_IMASK		0x19
 | |
| #define MII_CIS8201_IMASK_IEN		0x8000
 | |
| #define MII_CIS8201_IMASK_SPEED	0x4000
 | |
| #define MII_CIS8201_IMASK_LINK		0x2000
 | |
| #define MII_CIS8201_IMASK_DUPLEX	0x1000
 | |
| #define MII_CIS8201_IMASK_MASK		0xf000
 | |
| 
 | |
| /* Cicada Interrupt Status Register */
 | |
| #define MII_CIS8201_ISTAT		0x1a
 | |
| #define MII_CIS8201_ISTAT_STATUS	0x8000
 | |
| #define MII_CIS8201_ISTAT_SPEED	0x4000
 | |
| #define MII_CIS8201_ISTAT_LINK		0x2000
 | |
| #define MII_CIS8201_ISTAT_DUPLEX	0x1000
 | |
| 
 | |
| /* Cicada Auxiliary Control/Status Register */
 | |
| #define MII_CIS8201_AUX_CONSTAT        0x1c
 | |
| #define MII_CIS8201_AUXCONSTAT_INIT    0x0004
 | |
| #define MII_CIS8201_AUXCONSTAT_DUPLEX  0x0020
 | |
| #define MII_CIS8201_AUXCONSTAT_SPEED   0x0018
 | |
| #define MII_CIS8201_AUXCONSTAT_GBIT    0x0010
 | |
| #define MII_CIS8201_AUXCONSTAT_100     0x0008
 | |
| 
 | |
| MODULE_DESCRIPTION("Cicadia PHY driver");
 | |
| MODULE_AUTHOR("Andy Fleming");
 | |
| MODULE_LICENSE("GPL");
 | |
| 
 | |
| static int cis820x_config_init(struct phy_device *phydev)
 | |
| {
 | |
| 	int err;
 | |
| 
 | |
| 	err = phy_write(phydev, MII_CIS8201_AUX_CONSTAT,
 | |
| 			MII_CIS8201_AUXCONSTAT_INIT);
 | |
| 
 | |
| 	if (err < 0)
 | |
| 		return err;
 | |
| 
 | |
| 	err = phy_write(phydev, MII_CIS8201_EXT_CON1,
 | |
| 			MII_CIS8201_EXTCON1_INIT);
 | |
| 
 | |
| 	return err;
 | |
| }
 | |
| 
 | |
| static int cis820x_ack_interrupt(struct phy_device *phydev)
 | |
| {
 | |
| 	int err = phy_read(phydev, MII_CIS8201_ISTAT);
 | |
| 
 | |
| 	return (err < 0) ? err : 0;
 | |
| }
 | |
| 
 | |
| static int cis820x_config_intr(struct phy_device *phydev)
 | |
| {
 | |
| 	int err;
 | |
| 
 | |
| 	if(phydev->interrupts == PHY_INTERRUPT_ENABLED)
 | |
| 		err = phy_write(phydev, MII_CIS8201_IMASK, 
 | |
| 				MII_CIS8201_IMASK_MASK);
 | |
| 	else
 | |
| 		err = phy_write(phydev, MII_CIS8201_IMASK, 0);
 | |
| 
 | |
| 	return err;
 | |
| }
 | |
| 
 | |
| /* Cicada 8201, a.k.a Vitesse VSC8201 */
 | |
| static struct phy_driver cis8201_driver = {
 | |
| 	.phy_id		= 0x000fc410,
 | |
| 	.name		= "Cicada Cis8201",
 | |
| 	.phy_id_mask	= 0x000ffff0,
 | |
| 	.features	= PHY_GBIT_FEATURES,
 | |
| 	.flags		= PHY_HAS_INTERRUPT,
 | |
| 	.config_init	= &cis820x_config_init,
 | |
| 	.config_aneg	= &genphy_config_aneg,
 | |
| 	.read_status	= &genphy_read_status,
 | |
| 	.ack_interrupt	= &cis820x_ack_interrupt,
 | |
| 	.config_intr	= &cis820x_config_intr,
 | |
| 	.driver 	= { .owner = THIS_MODULE,},
 | |
| };
 | |
| 
 | |
| /* Cicada 8204 */
 | |
| static struct phy_driver cis8204_driver = {
 | |
| 	.phy_id		= 0x000fc440,
 | |
| 	.name		= "Cicada Cis8204",
 | |
| 	.phy_id_mask	= 0x000fffc0,
 | |
| 	.features	= PHY_GBIT_FEATURES,
 | |
| 	.flags		= PHY_HAS_INTERRUPT,
 | |
| 	.config_init	= &cis820x_config_init,
 | |
| 	.config_aneg	= &genphy_config_aneg,
 | |
| 	.read_status	= &genphy_read_status,
 | |
| 	.ack_interrupt	= &cis820x_ack_interrupt,
 | |
| 	.config_intr	= &cis820x_config_intr,
 | |
| 	.driver 	= { .owner = THIS_MODULE,},
 | |
| };
 | |
| 
 | |
| static int __init cicada_init(void)
 | |
| {
 | |
| 	int ret;
 | |
| 
 | |
| 	ret = phy_driver_register(&cis8204_driver);
 | |
| 	if (ret)
 | |
| 		goto err1;
 | |
| 
 | |
| 	ret = phy_driver_register(&cis8201_driver);
 | |
| 	if (ret)
 | |
| 		goto err2;
 | |
| 	return 0;
 | |
| 
 | |
| err2:
 | |
| 	phy_driver_unregister(&cis8204_driver);
 | |
| err1:
 | |
| 	return ret;
 | |
| }
 | |
| 
 | |
| static void __exit cicada_exit(void)
 | |
| {
 | |
| 	phy_driver_unregister(&cis8204_driver);
 | |
| 	phy_driver_unregister(&cis8201_driver);
 | |
| }
 | |
| 
 | |
| module_init(cicada_init);
 | |
| module_exit(cicada_exit);
 |