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
[PATCH] wireless: clean-up some "check return code" warnings
[safe/jmp/linux-2.6]
/
drivers
/
net
/
sis190.c
diff --git
a/drivers/net/sis190.c
b/drivers/net/sis190.c
index
7c1982a
..
aaba458
100644
(file)
--- a/
drivers/net/sis190.c
+++ b/
drivers/net/sis190.c
@@
-713,7
+713,7
@@
static void sis190_tx_interrupt(struct net_device *dev,
* The interrupt handler does all of the Rx thread work and cleans up after
* the Tx thread.
*/
* The interrupt handler does all of the Rx thread work and cleans up after
* the Tx thread.
*/
-static irqreturn_t sis190_interrupt(int irq, void *__dev
, struct pt_regs *regs
)
+static irqreturn_t sis190_interrupt(int irq, void *__dev)
{
struct net_device *dev = __dev;
struct sis190_private *tp = netdev_priv(dev);
{
struct net_device *dev = __dev;
struct sis190_private *tp = netdev_priv(dev);
@@
-758,7
+758,7
@@
static void sis190_netpoll(struct net_device *dev)
struct pci_dev *pdev = tp->pci_dev;
disable_irq(pdev->irq);
struct pci_dev *pdev = tp->pci_dev;
disable_irq(pdev->irq);
- sis190_interrupt(pdev->irq, dev
, NULL
);
+ sis190_interrupt(pdev->irq, dev);
enable_irq(pdev->irq);
}
#endif
enable_irq(pdev->irq);
}
#endif
@@
-1747,7
+1747,7
@@
static void sis190_set_msglevel(struct net_device *dev, u32 value)
tp->msg_enable = value;
}
tp->msg_enable = value;
}
-static struct ethtool_ops sis190_ethtool_ops = {
+static
const
struct ethtool_ops sis190_ethtool_ops = {
.get_settings = sis190_get_settings,
.set_settings = sis190_set_settings,
.get_drvinfo = sis190_get_drvinfo,
.get_settings = sis190_get_settings,
.set_settings = sis190_set_settings,
.get_drvinfo = sis190_get_drvinfo,