Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59eae1fa authored by Ben Dooks's avatar Ben Dooks Committed by Jeff Garzik
Browse files

DM9000: Cleanup source code 



Cleanup bits of the DM9000 driver to make the code
neater and easier to read. This is includes removing
some old definitions, re-indenting areas, etc.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 9088fa4f

drivers/net/dm9000.c

+30 −32
Original line number Diff line number Diff line
@@ -45,8 +45,7 @@ 
#define DM9000_PHY		0x40	/* PHY address 0x01 */



#define CARDNAME	"dm9000"

#define PFX CARDNAME ": "

#define DRV_VERSION	"1.30"

#define DRV_VERSION	"1.31"



#ifdef CONFIG_BLACKFIN

#define readsb	insb
@@ -109,11 +108,12 @@ typedef struct board_info { 
	u8		io_mode;		/* 0:word, 2:byte */

	u8		phy_addr;

	u8		imr_all;



	unsigned int	flags;

	unsigned int	in_suspend :1;

	int		debug_level;



	enum dm9000_type type;

	int debug_level;



	void (*inblk)(void __iomem *port, void *data, int length);

	void (*outblk)(void __iomem *port, void *data, int length);
@@ -153,19 +153,16 @@ static inline board_info_t *to_dm9000_board(struct net_device *dev) 
}



/* function declaration ------------------------------------- */

static int dm9000_probe(struct platform_device *);

static int dm9000_open(struct net_device *);

static int dm9000_start_xmit(struct sk_buff *, struct net_device *);

static int dm9000_stop(struct net_device *);

static int dm9000_ioctl(struct net_device *dev, struct ifreq *req, int cmd);



static void dm9000_init_dm9000(struct net_device *);



static irqreturn_t dm9000_interrupt(int, void *);



static int dm9000_phy_read(struct net_device *dev, int phyaddr_unsused, int reg);

static void dm9000_phy_write(struct net_device *dev, int phyaddr_unused, int reg,

			   int value);

static int dm9000_phy_read(struct net_device *dev, int phy, int reg);

static void dm9000_phy_write(struct net_device *dev, int phy, int reg, int v);



static void dm9000_read_eeprom(board_info_t *, int addr, u8 *to);

static void dm9000_write_eeprom(board_info_t *, int addr, u8 *dp);
@@ -655,7 +652,7 @@ dm9000_probe(struct platform_device *pdev) 


	dm9000_reset(db);



	/* try two times, DM9000 sometimes gets the first read wrong */

	/* try multiple times, DM9000 sometimes gets the read wrong */

	for (i = 0; i < 8; i++) {

		id_val  = ior(db, DM9000_VIDL);

		id_val |= (u32)ior(db, DM9000_VIDH) << 8;
@@ -763,7 +760,7 @@ out: 
static int

dm9000_open(struct net_device *dev)

{

	board_info_t *db = (board_info_t *) dev->priv;

	board_info_t *db = dev->priv;

	unsigned long irqflags = db->irq_res->flags & IRQF_TRIGGER_MASK;



	if (netif_msg_ifup(db))
@@ -803,7 +800,7 @@ dm9000_open(struct net_device *dev) 
static void

dm9000_init_dm9000(struct net_device *dev)

{

	board_info_t *db = (board_info_t *) dev->priv;

	board_info_t *db = dev->priv;

	unsigned int imr;



	dm9000_dbg(db, 1, "entering %s\n", __func__);
@@ -854,7 +851,7 @@ static int 
dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev)

{

	unsigned long flags;

	board_info_t *db = (board_info_t *) dev->priv;

	board_info_t *db = dev->priv;



	dm9000_dbg(db, 3, "%s:\n", __func__);
@@ -897,7 +894,7 @@ dm9000_start_xmit(struct sk_buff *skb, struct net_device *dev) 
static void

dm9000_shutdown(struct net_device *dev)

{

	board_info_t *db = (board_info_t *) dev->priv;

	board_info_t *db = dev->priv;



	/* RESET device */

	dm9000_phy_write(dev, 0, MII_BMCR, BMCR_RESET);	/* PHY RESET */
@@ -913,7 +910,7 @@ dm9000_shutdown(struct net_device *dev) 
static int

dm9000_stop(struct net_device *ndev)

{

	board_info_t *db = (board_info_t *) ndev->priv;

	board_info_t *db = ndev->priv;



	if (netif_msg_ifdown(db))

		dev_dbg(db->dev, "shutting down %s\n", ndev->name);
@@ -964,7 +961,7 @@ static irqreturn_t 
dm9000_interrupt(int irq, void *dev_id)

{

	struct net_device *dev = dev_id;

	board_info_t *db = (board_info_t *) dev->priv;

	board_info_t *db = dev->priv;

	int int_status;

	u8 reg_save;
@@ -1345,7 +1342,8 @@ dm9000_phy_read(struct net_device *dev, int phy_reg_unused, int reg) 
 *   Write a word to phyxcer

 */

static void

dm9000_phy_write(struct net_device *dev, int phyaddr_unused, int reg, int value)

dm9000_phy_write(struct net_device *dev,

		 int phyaddr_unused, int reg, int value)

{

	board_info_t *db = (board_info_t *) dev->priv;

	unsigned long flags;
@@ -1454,7 +1452,7 @@ dm9000_init(void) 
{

	printk(KERN_INFO "%s Ethernet Driver, V%s\n", CARDNAME, DRV_VERSION);



	return platform_driver_register(&dm9000_driver);	/* search board and register */

	return platform_driver_register(&dm9000_driver);

}



static void __exit