git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pciehp: make pciehp build for powerpc
[safe/jmp/linux-2.6]
/
drivers
/
net
/
cassini.c
diff --git
a/drivers/net/cassini.c
b/drivers/net/cassini.c
index
ac48f75
..
a31544c
100644
(file)
--- a/
drivers/net/cassini.c
+++ b/
drivers/net/cassini.c
@@
-66,7
+66,6
@@
* by default, the selective clear mask is set up to process rx packets.
*/
* by default, the selective clear mask is set up to process rx packets.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/kernel.h>
@@
-2915,8
+2914,7
@@
static int cas_start_xmit(struct sk_buff *skb, struct net_device *dev)
*/
static int ring;
*/
static int ring;
- skb = skb_padto(skb, cp->min_frame_size);
- if (!skb)
+ if (skb_padto(skb, cp->min_frame_size))
return 0;
/* XXX: we need some higher-level QoS hooks to steer packets to
return 0;
/* XXX: we need some higher-level QoS hooks to steer packets to
@@
-4351,7
+4349,7
@@
static int cas_open(struct net_device *dev)
* mapping to expose them
*/
if (request_irq(cp->pdev->irq, cas_interrupt,
* mapping to expose them
*/
if (request_irq(cp->pdev->irq, cas_interrupt,
-
SA_SHIRQ
, dev->name, (void *) dev)) {
+
IRQF_SHARED
, dev->name, (void *) dev)) {
printk(KERN_ERR "%s: failed to request irq !\n",
cp->dev->name);
err = -EAGAIN;
printk(KERN_ERR "%s: failed to request irq !\n",
cp->dev->name);
err = -EAGAIN;
@@
-4877,7
+4875,7
@@
static int __devinit cas_init_one(struct pci_dev *pdev,
const struct pci_device_id *ent)
{
static int cas_version_printed = 0;
const struct pci_device_id *ent)
{
static int cas_version_printed = 0;
- unsigned long casreg_
base, casreg_
len;
+ unsigned long casreg_len;
struct net_device *dev;
struct cas *cp;
int i, err, pci_using_dac;
struct net_device *dev;
struct cas *cp;
int i, err, pci_using_dac;
@@
-4889,13
+4887,12
@@
static int __devinit cas_init_one(struct pci_dev *pdev,
err = pci_enable_device(pdev);
if (err) {
err = pci_enable_device(pdev);
if (err) {
- printk(KERN_ERR PFX "Cannot enable PCI device, "
- "aborting.\n");
+ dev_err(&pdev->dev, "Cannot enable PCI device, aborting.\n");
return err;
}
if (!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)) {
return err;
}
if (!(pci_resource_flags(pdev, 0) & IORESOURCE_MEM)) {
-
printk(KERN_ERR PFX
"Cannot find proper PCI device "
+
dev_err(&pdev->dev,
"Cannot find proper PCI device "
"base address, aborting.\n");
err = -ENODEV;
goto err_out_disable_pdev;
"base address, aborting.\n");
err = -ENODEV;
goto err_out_disable_pdev;
@@
-4903,7
+4900,7
@@
static int __devinit cas_init_one(struct pci_dev *pdev,
dev = alloc_etherdev(sizeof(*cp));
if (!dev) {
dev = alloc_etherdev(sizeof(*cp));
if (!dev) {
-
printk(KERN_ERR PFX
"Etherdev alloc failed, aborting.\n");
+
dev_err(&pdev->dev,
"Etherdev alloc failed, aborting.\n");
err = -ENOMEM;
goto err_out_disable_pdev;
}
err = -ENOMEM;
goto err_out_disable_pdev;
}
@@
-4912,8
+4909,7
@@
static int __devinit cas_init_one(struct pci_dev *pdev,
err = pci_request_regions(pdev, dev->name);
if (err) {
err = pci_request_regions(pdev, dev->name);
if (err) {
- printk(KERN_ERR PFX "Cannot obtain PCI resources, "
- "aborting.\n");
+ dev_err(&pdev->dev, "Cannot obtain PCI resources, aborting.\n");
goto err_out_free_netdev;
}
pci_set_master(pdev);
goto err_out_free_netdev;
}
pci_set_master(pdev);
@@
-4943,7
+4939,7
@@
static int __devinit cas_init_one(struct pci_dev *pdev,
if (pci_write_config_byte(pdev,
PCI_CACHE_LINE_SIZE,
cas_cacheline_size)) {
if (pci_write_config_byte(pdev,
PCI_CACHE_LINE_SIZE,
cas_cacheline_size)) {
-
printk(KERN_ERR PFX
"Could not set PCI cache "
+
dev_err(&pdev->dev,
"Could not set PCI cache "
"line size\n");
goto err_write_cacheline;
}
"line size\n");
goto err_write_cacheline;
}
@@
-4957,7
+4953,7
@@
static int __devinit cas_init_one(struct pci_dev *pdev,
err = pci_set_consistent_dma_mask(pdev,
DMA_64BIT_MASK);
if (err < 0) {
err = pci_set_consistent_dma_mask(pdev,
DMA_64BIT_MASK);
if (err < 0) {
-
printk(KERN_ERR PFX
"Unable to obtain 64-bit DMA "
+
dev_err(&pdev->dev,
"Unable to obtain 64-bit DMA "
"for consistent allocations\n");
goto err_out_free_res;
}
"for consistent allocations\n");
goto err_out_free_res;
}
@@
-4965,14
+4961,13
@@
static int __devinit cas_init_one(struct pci_dev *pdev,
} else {
err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
if (err) {
} else {
err = pci_set_dma_mask(pdev, DMA_32BIT_MASK);
if (err) {
-
printk(KERN_ERR PFX
"No usable DMA configuration, "
+
dev_err(&pdev->dev,
"No usable DMA configuration, "
"aborting.\n");
goto err_out_free_res;
}
pci_using_dac = 0;
}
"aborting.\n");
goto err_out_free_res;
}
pci_using_dac = 0;
}
- casreg_base = pci_resource_start(pdev, 0);
casreg_len = pci_resource_len(pdev, 0);
cp = netdev_priv(dev);
casreg_len = pci_resource_len(pdev, 0);
cp = netdev_priv(dev);
@@
-5024,10
+5019,9
@@
static int __devinit cas_init_one(struct pci_dev *pdev,
cp->timer_ticks = 0;
/* give us access to cassini registers */
cp->timer_ticks = 0;
/* give us access to cassini registers */
- cp->regs =
ioremap(casreg_base
, casreg_len);
+ cp->regs =
pci_iomap(pdev, 0
, casreg_len);
if (cp->regs == 0UL) {
if (cp->regs == 0UL) {
- printk(KERN_ERR PFX "Cannot map device registers, "
- "aborting.\n");
+ dev_err(&pdev->dev, "Cannot map device registers, aborting.\n");
goto err_out_free_res;
}
cp->casreg_len = casreg_len;
goto err_out_free_res;
}
cp->casreg_len = casreg_len;
@@
-5043,8
+5037,7
@@
static int __devinit cas_init_one(struct pci_dev *pdev,
pci_alloc_consistent(pdev, sizeof(struct cas_init_block),
&cp->block_dvma);
if (!cp->init_block) {
pci_alloc_consistent(pdev, sizeof(struct cas_init_block),
&cp->block_dvma);
if (!cp->init_block) {
- printk(KERN_ERR PFX "Cannot allocate init block, "
- "aborting.\n");
+ dev_err(&pdev->dev, "Cannot allocate init block, aborting.\n");
goto err_out_iounmap;
}
goto err_out_iounmap;
}
@@
-5088,8
+5081,7
@@
static int __devinit cas_init_one(struct pci_dev *pdev,
dev->features |= NETIF_F_HIGHDMA;
if (register_netdev(dev)) {
dev->features |= NETIF_F_HIGHDMA;
if (register_netdev(dev)) {
- printk(KERN_ERR PFX "Cannot register net device, "
- "aborting.\n");
+ dev_err(&pdev->dev, "Cannot register net device, aborting.\n");
goto err_out_free_consistent;
}
goto err_out_free_consistent;
}
@@
-5123,7
+5115,7
@@
err_out_iounmap:
cas_shutdown(cp);
mutex_unlock(&cp->pm_mutex);
cas_shutdown(cp);
mutex_unlock(&cp->pm_mutex);
-
iounmap(
cp->regs);
+
pci_iounmap(pdev,
cp->regs);
err_out_free_res:
err_out_free_res:
@@
-5171,7
+5163,7
@@
static void __devexit cas_remove_one(struct pci_dev *pdev)
#endif
pci_free_consistent(pdev, sizeof(struct cas_init_block),
cp->init_block, cp->block_dvma);
#endif
pci_free_consistent(pdev, sizeof(struct cas_init_block),
cp->init_block, cp->block_dvma);
-
iounmap(
cp->regs);
+
pci_iounmap(pdev,
cp->regs);
free_netdev(dev);
pci_release_regions(pdev);
pci_disable_device(pdev);
free_netdev(dev);
pci_release_regions(pdev);
pci_disable_device(pdev);