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
Pull sony into release branch
[pandora-kernel.git]
/
drivers
/
misc
/
ioc4.c
diff --git
a/drivers/misc/ioc4.c
b/drivers/misc/ioc4.c
index
1c3c14a
..
6a5a05d
100644
(file)
--- a/
drivers/misc/ioc4.c
+++ b/
drivers/misc/ioc4.c
@@
-32,6
+32,7
@@
#include <linux/ktime.h>
#include <linux/mutex.h>
#include <linux/time.h>
#include <linux/ktime.h>
#include <linux/mutex.h>
#include <linux/time.h>
+#include <asm/io.h>
/***************
* Definitions *
/***************
* Definitions *
@@
-209,8
+210,8
@@
ioc4_clock_calibrate(struct ioc4_driver_data *idd)
do_div(ns, IOC4_EXTINT_COUNT_DIVISOR);
printk(KERN_DEBUG
do_div(ns, IOC4_EXTINT_COUNT_DIVISOR);
printk(KERN_DEBUG
- "IOC4 %s: PCI clock is %ll
d
ns.\n",
- pci_name(idd->idd_pdev), ns);
+ "IOC4 %s: PCI clock is %ll
u
ns.\n",
+ pci_name(idd->idd_pdev),
(unsigned long long)
ns);
}
/* Remember results. We store the extint clock period rather
}
/* Remember results. We store the extint clock period rather
@@
-308,7
+309,7
@@
ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
ret = -ENODEV;
goto out_pci;
}
ret = -ENODEV;
goto out_pci;
}
- if (!request_region(idd->idd_bar0, sizeof(struct ioc4_misc_regs),
+ if (!request_
mem_
region(idd->idd_bar0, sizeof(struct ioc4_misc_regs),
"ioc4_misc")) {
printk(KERN_WARNING
"%s: Unable to request IOC4 misc region "
"ioc4_misc")) {
printk(KERN_WARNING
"%s: Unable to request IOC4 misc region "
@@
-378,7
+379,7
@@
ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
return 0;
out_misc_region:
return 0;
out_misc_region:
- release_region(idd->idd_bar0, sizeof(struct ioc4_misc_regs));
+ release_
mem_
region(idd->idd_bar0, sizeof(struct ioc4_misc_regs));
out_pci:
kfree(idd);
out_idd:
out_pci:
kfree(idd);
out_idd:
@@
-417,7
+418,7
@@
ioc4_remove(struct pci_dev *pdev)
"Device removal may be incomplete.\n",
__FUNCTION__, pci_name(idd->idd_pdev));
}
"Device removal may be incomplete.\n",
__FUNCTION__, pci_name(idd->idd_pdev));
}
- release_region(idd->idd_bar0, sizeof(struct ioc4_misc_regs));
+ release_
mem_
region(idd->idd_bar0, sizeof(struct ioc4_misc_regs));
/* Disable IOC4 and relinquish */
pci_disable_device(pdev);
/* Disable IOC4 and relinquish */
pci_disable_device(pdev);