git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
net
/
b44.c
diff --git
a/drivers/net/b44.c
b/drivers/net/b44.c
index
a69331e
..
6c4ef96
100644
(file)
--- a/
drivers/net/b44.c
+++ b/
drivers/net/b44.c
@@
-25,6
+25,7
@@
#include <linux/pci.h>
#include <linux/delay.h>
#include <linux/init.h>
#include <linux/pci.h>
#include <linux/delay.h>
#include <linux/init.h>
+#include <linux/interrupt.h>
#include <linux/dma-mapping.h>
#include <linux/ssb/ssb.h>
#include <linux/slab.h>
#include <linux/dma-mapping.h>
#include <linux/ssb/ssb.h>
#include <linux/slab.h>
@@
-38,6
+39,7
@@
#define DRV_MODULE_NAME "b44"
#define DRV_MODULE_VERSION "2.0"
#define DRV_MODULE_NAME "b44"
#define DRV_MODULE_VERSION "2.0"
+#define DRV_DESCRIPTION "Broadcom 44xx/47xx 10/100 PCI ethernet driver"
#define B44_DEF_MSG_ENABLE \
(NETIF_MSG_DRV | \
#define B44_DEF_MSG_ENABLE \
(NETIF_MSG_DRV | \
@@
-90,11
+92,8
@@
#define B44_ETHIPV6UDP_HLEN 62
#define B44_ETHIPV4UDP_HLEN 42
#define B44_ETHIPV6UDP_HLEN 62
#define B44_ETHIPV4UDP_HLEN 42
-static char version[] __devinitdata =
- DRV_MODULE_NAME ".c:v" DRV_MODULE_VERSION "\n";
-
MODULE_AUTHOR("Felix Fietkau, Florian Schirmer, Pekka Pietikainen, David S. Miller");
MODULE_AUTHOR("Felix Fietkau, Florian Schirmer, Pekka Pietikainen, David S. Miller");
-MODULE_DESCRIPTION(
"Broadcom 44xx/47xx 10/100 PCI ethernet driver"
);
+MODULE_DESCRIPTION(
DRV_DESCRIPTION
);
MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_MODULE_VERSION);
MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_MODULE_VERSION);
@@
-609,7
+608,7
@@
static void b44_tx(struct b44 *bp)
skb->len,
DMA_TO_DEVICE);
rp->skb = NULL;
skb->len,
DMA_TO_DEVICE);
rp->skb = NULL;
- dev_kfree_skb
_irq
(skb);
+ dev_kfree_skb(skb);
}
bp->tx_cons = cons;
}
bp->tx_cons = cons;
@@
-2129,16
+2128,13
@@
static const struct net_device_ops b44_netdev_ops = {
static int __devinit b44_init_one(struct ssb_device *sdev,
const struct ssb_device_id *ent)
{
static int __devinit b44_init_one(struct ssb_device *sdev,
const struct ssb_device_id *ent)
{
- static int b44_version_printed = 0;
struct net_device *dev;
struct b44 *bp;
int err;
instance++;
struct net_device *dev;
struct b44 *bp;
int err;
instance++;
- if (b44_version_printed++ == 0)
- pr_info("%s", version);
-
+ pr_info_once("%s version %s\n", DRV_DESCRIPTION, DRV_MODULE_VERSION);
dev = alloc_etherdev(sizeof(*bp));
if (!dev) {
dev = alloc_etherdev(sizeof(*bp));
if (!dev) {
@@
-2224,8
+2220,7
@@
static int __devinit b44_init_one(struct ssb_device *sdev,
if (b44_phy_reset(bp) < 0)
bp->phy_addr = B44_PHY_ADDR_NO_PHY;
if (b44_phy_reset(bp) < 0)
bp->phy_addr = B44_PHY_ADDR_NO_PHY;
- netdev_info(dev, "Broadcom 44xx/47xx 10/100BaseT Ethernet %pM\n",
- dev->dev_addr);
+ netdev_info(dev, "%s %pM\n", DRV_DESCRIPTION, dev->dev_addr);
return 0;
return 0;
@@
-2335,7
+2330,7
@@
static struct ssb_driver b44_ssb_driver = {
.resume = b44_resume,
};
.resume = b44_resume,
};
-static inline int b44_pci_init(void)
+static inline int
__init
b44_pci_init(void)
{
int err = 0;
#ifdef CONFIG_B44_PCI
{
int err = 0;
#ifdef CONFIG_B44_PCI
@@
-2344,7
+2339,7
@@
static inline int b44_pci_init(void)
return err;
}
return err;
}
-static inline void b44_pci_exit(void)
+static inline void
__exit
b44_pci_exit(void)
{
#ifdef CONFIG_B44_PCI
ssb_pcihost_unregister(&b44_pci_driver);
{
#ifdef CONFIG_B44_PCI
ssb_pcihost_unregister(&b44_pci_driver);