Commit b399c86d authored by Dave Jones's avatar Dave Jones Committed by Dave Jones

[PATCH] finish init_etherdev conversion for gt96100eth

- No need to alloc dev->priv (due to init_etherdev usage)
- No need to kfree dev->priv (kfree'd with (dev) already)
parent 30e5fd92
...@@ -758,19 +758,6 @@ gt96100_probe1(int port_num) ...@@ -758,19 +758,6 @@ gt96100_probe1(int port_num)
goto free_region; goto free_region;
} }
/* Initialize our private structure. */
if (dev->priv == NULL) {
gp = (struct gt96100_private *)kmalloc(sizeof(*gp),
GFP_KERNEL);
if (gp == NULL) {
retval = -ENOMEM;
goto free_region;
}
dev->priv = gp;
}
gp = dev->priv; gp = dev->priv;
memset(gp, 0, sizeof(*gp)); // clear it memset(gp, 0, sizeof(*gp)); // clear it
...@@ -854,8 +841,6 @@ gt96100_probe1(int port_num) ...@@ -854,8 +841,6 @@ gt96100_probe1(int port_num)
free_region: free_region:
release_region(gtif->iobase, GT96100_ETH_IO_SIZE); release_region(gtif->iobase, GT96100_ETH_IO_SIZE);
unregister_netdev(dev); unregister_netdev(dev);
if (dev->priv != NULL)
kfree (dev->priv);
kfree (dev); kfree (dev);
err("%s failed. Returns %d\n", __FUNCTION__, retval); err("%s failed. Returns %d\n", __FUNCTION__, retval);
return retval; return retval;
...@@ -1601,8 +1586,6 @@ static void gt96100_cleanup_module(void) ...@@ -1601,8 +1586,6 @@ static void gt96100_cleanup_module(void)
(struct gt96100_private *)gtif->dev->priv; (struct gt96100_private *)gtif->dev->priv;
release_region(gtif->iobase, gp->io_size); release_region(gtif->iobase, gp->io_size);
unregister_netdev(gtif->dev); unregister_netdev(gtif->dev);
if (gtif->dev->priv != NULL)
kfree (gtif->dev->priv);
kfree (gtif->dev); kfree (gtif->dev);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment