1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 179871d9e71f..8cc22568ebd3 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -699,7 +699,8 @@ DEFINE_WINDOW_IO(32)
 #define DEVICE_PCI(dev) NULL
 #endif
 
-#define VORTEX_PCI(vp) (((vp)->gendev) ? DEVICE_PCI((vp)->gendev) : NULL)
+#define VORTEX_PCI(vp)                                                  \
+        ((struct pci_dev *) (((vp)->gendev) ? DEVICE_PCI((vp)->gendev) : NULL))
 
 #ifdef CONFIG_EISA
 #define DEVICE_EISA(dev) (((dev)->bus == &eisa_bus_type) ? to_eisa_device((dev)) : NULL)
@@ -707,7 +708,8 @@ DEFINE_WINDOW_IO(32)
 #define DEVICE_EISA(dev) NULL
 #endif
 
-#define VORTEX_EISA(vp) (((vp)->gendev) ? DEVICE_EISA((vp)->gendev) : NULL)
+#define VORTEX_EISA(vp)                                                 \
+        ((struct eisa_device *) (((vp)->gendev) ? DEVICE_EISA((vp)->gendev) : NULL))
 
 /* The action to take with a media selection timer tick.
    Note that we deviate from the 3Com order by checking 10base2 before AUI.
@@ -982,7 +984,7 @@ static int __init vortex_eisa_init(void)
                  * any device have been found when we exit from
                  * eisa_driver_register (the bus root driver may not be
                  * initialized yet). So we blindly assume something was
-                 * found, and let the sysfs magic happend...
+                 * found, and let the sysfs magic happened...
                  */
                 eisa_found = 1;
         }
@@ -1742,7 +1744,7 @@ vortex_open(struct net_device *dev)
 
         /* Use the now-standard shared IRQ implementation. */
         if ((retval = request_irq(dev->irq, vp->full_bus_master_rx ?
-                                &boomerang_interrupt : &vortex_interrupt, IRQF_SHARED, dev->name, dev))) {
+                                boomerang_interrupt : vortex_interrupt, IRQF_SHARED, dev->name, dev))) {
                 pr_err("%s: Could not reserve IRQ %d\n", dev->name, dev->irq);
                 goto err;
         }