projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PCI: Change all drivers to use pci_device->revision
[linux-2.6-block.git]
/
drivers
/
net
/
via-rhine.c
diff --git
a/drivers/net/via-rhine.c
b/drivers/net/via-rhine.c
index f3a972e74e9ada2983afd620b13fe29ccec6b880..73e9c3dcdddec7eacc80c63141dd2b06331dba0b 100644
(file)
--- a/
drivers/net/via-rhine.c
+++ b/
drivers/net/via-rhine.c
@@
-622,7
+622,6
@@
static int __devinit rhine_init_one(struct pci_dev *pdev,
struct net_device *dev;
struct rhine_private *rp;
int i, rc;
struct net_device *dev;
struct rhine_private *rp;
int i, rc;
- u8 pci_rev;
u32 quirks;
long pioaddr;
long memaddr;
u32 quirks;
long pioaddr;
long memaddr;
@@
-642,27
+641,25
@@
static int __devinit rhine_init_one(struct pci_dev *pdev,
printk(version);
#endif
printk(version);
#endif
- pci_read_config_byte(pdev, PCI_REVISION_ID, &pci_rev);
-
io_size = 256;
phy_id = 0;
quirks = 0;
name = "Rhine";
io_size = 256;
phy_id = 0;
quirks = 0;
name = "Rhine";
- if (p
ci_rev
< VTunknown0) {
+ if (p
dev->revision
< VTunknown0) {
quirks = rqRhineI;
io_size = 128;
}
quirks = rqRhineI;
io_size = 128;
}
- else if (p
ci_rev
>= VT6102) {
+ else if (p
dev->revision
>= VT6102) {
quirks = rqWOL | rqForceReset;
quirks = rqWOL | rqForceReset;
- if (p
ci_rev
< VT6105) {
+ if (p
dev->revision
< VT6105) {
name = "Rhine II";
quirks |= rqStatusWBRace; /* Rhine-II exclusive */
}
else {
phy_id = 1; /* Integrated PHY, phy_id fixed to 1 */
name = "Rhine II";
quirks |= rqStatusWBRace; /* Rhine-II exclusive */
}
else {
phy_id = 1; /* Integrated PHY, phy_id fixed to 1 */
- if (p
ci_rev
>= VT6105_B0)
+ if (p
dev->revision
>= VT6105_B0)
quirks |= rq6patterns;
quirks |= rq6patterns;
- if (p
ci_rev
< VT6105M)
+ if (p
dev->revision
< VT6105M)
name = "Rhine III";
else
name = "Rhine III (Management Adapter)";
name = "Rhine III";
else
name = "Rhine III (Management Adapter)";
@@
-1486,7
+1483,6
@@
static int rhine_rx(struct net_device *dev, int limit)
copying to a minimally-sized skbuff. */
if (pkt_len < rx_copybreak &&
(skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
copying to a minimally-sized skbuff. */
if (pkt_len < rx_copybreak &&
(skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
- skb->dev = dev;
skb_reserve(skb, 2); /* 16 byte align the IP header */
pci_dma_sync_single_for_cpu(rp->pdev,
rp->rx_skbuff_dma[entry],
skb_reserve(skb, 2); /* 16 byte align the IP header */
pci_dma_sync_single_for_cpu(rp->pdev,
rp->rx_skbuff_dma[entry],