git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
drivers
/
net
/
arm
/
etherh.c
diff --git
a/drivers/net/arm/etherh.c
b/drivers/net/arm/etherh.c
index
61f574a
..
0d37d9d
100644
(file)
--- a/
drivers/net/arm/etherh.c
+++ b/
drivers/net/arm/etherh.c
@@
-31,7
+31,6
@@
#include <linux/types.h>
#include <linux/fcntl.h>
#include <linux/interrupt.h>
#include <linux/types.h>
#include <linux/fcntl.h>
#include <linux/interrupt.h>
-#include <linux/ptrace.h>
#include <linux/ioport.h>
#include <linux/in.h>
#include <linux/slab.h>
#include <linux/ioport.h>
#include <linux/in.h>
#include <linux/slab.h>
@@
-686,7
+685,7
@@
etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
eh->supported = data->supported;
eh->ctrl = 0;
eh->id = ec->cid.product;
eh->supported = data->supported;
eh->ctrl = 0;
eh->id = ec->cid.product;
- eh->memc =
ioremap(ecard_resource_start(ec, ECARD_RES_MEMC)
, PAGE_SIZE);
+ eh->memc =
ecardm_iomap(ec, ECARD_RES_MEMC, 0
, PAGE_SIZE);
if (!eh->memc) {
ret = -ENOMEM;
goto free;
if (!eh->memc) {
ret = -ENOMEM;
goto free;
@@
-694,7
+693,7
@@
etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
eh->ctrl_port = eh->memc;
if (data->ctrl_ioc) {
eh->ctrl_port = eh->memc;
if (data->ctrl_ioc) {
- eh->ioc_fast =
ioremap(ecard_resource_start(ec, ECARD_RES_IOCFAST)
, PAGE_SIZE);
+ eh->ioc_fast =
ecardm_iomap(ec, ECARD_RES_IOCFAST, 0
, PAGE_SIZE);
if (!eh->ioc_fast) {
ret = -ENOMEM;
goto free;
if (!eh->ioc_fast) {
ret = -ENOMEM;
goto free;
@@
-710,8
+709,7
@@
etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
* IRQ and control port handling - only for non-NIC slot cards.
*/
if (ec->slot_no != 8) {
* IRQ and control port handling - only for non-NIC slot cards.
*/
if (ec->slot_no != 8) {
- ec->ops = ðerh_ops;
- ec->irq_data = eh;
+ ecard_setirq(ec, ðerh_ops, eh);
} else {
/*
* If we're in the NIC slot, make sure the IRQ is enabled
} else {
/*
* If we're in the NIC slot, make sure the IRQ is enabled
@@
-759,10
+757,6
@@
etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
return 0;
free:
return 0;
free:
- if (eh->ioc_fast)
- iounmap(eh->ioc_fast);
- if (eh->memc)
- iounmap(eh->memc);
free_netdev(dev);
release:
ecard_release_resources(ec);
free_netdev(dev);
release:
ecard_release_resources(ec);
@@
-773,16
+767,10
@@
etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
static void __devexit etherh_remove(struct expansion_card *ec)
{
struct net_device *dev = ecard_get_drvdata(ec);
static void __devexit etherh_remove(struct expansion_card *ec)
{
struct net_device *dev = ecard_get_drvdata(ec);
- struct etherh_priv *eh = etherh_priv(dev);
ecard_set_drvdata(ec, NULL);
unregister_netdev(dev);
ecard_set_drvdata(ec, NULL);
unregister_netdev(dev);
- ec->ops = NULL;
-
- if (eh->ioc_fast)
- iounmap(eh->ioc_fast);
- iounmap(eh->memc);
free_netdev(dev);
free_netdev(dev);