git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
drivers
/
net
/
bmac.c
diff --git
a/drivers/net/bmac.c
b/drivers/net/bmac.c
index
3d2be7c
..
bbca8ae
100644
(file)
--- a/
drivers/net/bmac.c
+++ b/
drivers/net/bmac.c
@@
-218,7
+218,7
@@
void bmwrite(struct net_device *dev, unsigned long reg_offset, unsigned data )
static inline
static inline
-
volatile
unsigned short bmread(struct net_device *dev, unsigned long reg_offset )
+unsigned short bmread(struct net_device *dev, unsigned long reg_offset )
{
return in_le16((void __iomem *)dev->base_addr + reg_offset);
}
{
return in_le16((void __iomem *)dev->base_addr + reg_offset);
}
@@
-455,7
+455,7
@@
static void bmac_init_chip(struct net_device *dev)
}
#ifdef CONFIG_PM
}
#ifdef CONFIG_PM
-static int bmac_suspend(struct macio_dev *mdev,
u32
state)
+static int bmac_suspend(struct macio_dev *mdev,
pm_message_t
state)
{
struct net_device* dev = macio_get_drvdata(mdev);
struct bmac_data *bp = netdev_priv(dev);
{
struct net_device* dev = macio_get_drvdata(mdev);
struct bmac_data *bp = netdev_priv(dev);
@@
-1261,7
+1261,7
@@
static void bmac_reset_and_enable(struct net_device *dev)
spin_unlock_irqrestore(&bp->lock, flags);
}
spin_unlock_irqrestore(&bp->lock, flags);
}
-static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_
match
*match)
+static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_
device_id
*match)
{
int j, rev, ret;
struct bmac_data *bp;
{
int j, rev, ret;
struct bmac_data *bp;
@@
-1412,7
+1412,6
@@
static int bmac_open(struct net_device *dev)
bp->opened = 1;
bmac_reset_and_enable(dev);
enable_irq(dev->irq);
bp->opened = 1;
bmac_reset_and_enable(dev);
enable_irq(dev->irq);
- dev->flags |= IFF_RUNNING;
return 0;
}
return 0;
}
@@
-1425,7
+1424,6
@@
static int bmac_close(struct net_device *dev)
int i;
bp->sleeping = 1;
int i;
bp->sleeping = 1;
- dev->flags &= ~(IFF_UP | IFF_RUNNING);
/* disable rx and tx */
config = bmread(dev, RXCFG);
/* disable rx and tx */
config = bmread(dev, RXCFG);
@@
-1647,22
+1645,20
@@
static int __devexit bmac_remove(struct macio_dev *mdev)
return 0;
}
return 0;
}
-static struct of_
match
bmac_match[] =
+static struct of_
device_id
bmac_match[] =
{
{
.name = "bmac",
{
{
.name = "bmac",
- .type = OF_ANY_MATCH,
- .compatible = OF_ANY_MATCH,
.data = (void *)0,
},
{
.data = (void *)0,
},
{
- .name = OF_ANY_MATCH,
.type = "network",
.compatible = "bmac+",
.data = (void *)1,
},
{},
};
.type = "network",
.compatible = "bmac+",
.data = (void *)1,
},
{},
};
+MODULE_DEVICE_TABLE (of, bmac_match);
static struct macio_driver bmac_driver =
{
static struct macio_driver bmac_driver =
{
@@
-1694,10
+1690,8
@@
static void __exit bmac_exit(void)
{
macio_unregister_driver(&bmac_driver);
{
macio_unregister_driver(&bmac_driver);
- if (bmac_emergency_rxbuf != NULL) {
- kfree(bmac_emergency_rxbuf);
- bmac_emergency_rxbuf = NULL;
- }
+ kfree(bmac_emergency_rxbuf);
+ bmac_emergency_rxbuf = NULL;
}
MODULE_AUTHOR("Randy Gobbel/Paul Mackerras");
}
MODULE_AUTHOR("Randy Gobbel/Paul Mackerras");