projects
/
GitHub
/
LineageOS
/
android_kernel_samsung_universal7580.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'vfio-for-v3.8-v2' of git://github.com/awilliam/linux-vfio
[GitHub/LineageOS/android_kernel_samsung_universal7580.git]
/
drivers
/
misc
/
ioc4.c
diff --git
a/drivers/misc/ioc4.c
b/drivers/misc/ioc4.c
index 6a7710603a904dcb2522738c18ab8e62d789324c..06f6ad29ceff294a67cb34c10f88b2a1f1e6e78a 100644
(file)
--- a/
drivers/misc/ioc4.c
+++ b/
drivers/misc/ioc4.c
@@
-139,7
+139,7
@@
ioc4_unregister_submodule(struct ioc4_submodule *is)
* even though the following code utilizes external interrupt registers
* to perform the speed calculation.
*/
* even though the following code utilizes external interrupt registers
* to perform the speed calculation.
*/
-static void
__devinit
+static void
ioc4_clock_calibrate(struct ioc4_driver_data *idd)
{
union ioc4_int_out int_out;
ioc4_clock_calibrate(struct ioc4_driver_data *idd)
{
union ioc4_int_out int_out;
@@
-231,7
+231,7
@@
ioc4_clock_calibrate(struct ioc4_driver_data *idd)
* on the same PCI bus at slot number 3 to differentiate IO9 from IO10.
* If neither is present, it's a PCI-RT.
*/
* on the same PCI bus at slot number 3 to differentiate IO9 from IO10.
* If neither is present, it's a PCI-RT.
*/
-static unsigned int
__devinit
+static unsigned int
ioc4_variant(struct ioc4_driver_data *idd)
{
struct pci_dev *pdev = NULL;
ioc4_variant(struct ioc4_driver_data *idd)
{
struct pci_dev *pdev = NULL;
@@
-279,7
+279,7
@@
ioc4_load_modules(struct work_struct *work)
static DECLARE_WORK(ioc4_load_modules_work, ioc4_load_modules);
/* Adds a new instance of an IOC4 card */
static DECLARE_WORK(ioc4_load_modules_work, ioc4_load_modules);
/* Adds a new instance of an IOC4 card */
-static int
__devinit
+static int
ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
{
struct ioc4_driver_data *idd;
ioc4_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
{
struct ioc4_driver_data *idd;
@@
-415,7
+415,7
@@
out:
}
/* Removes a particular instance of an IOC4 card. */
}
/* Removes a particular instance of an IOC4 card. */
-static void
__devexit
+static void
ioc4_remove(struct pci_dev *pdev)
{
struct ioc4_submodule *is;
ioc4_remove(struct pci_dev *pdev)
{
struct ioc4_submodule *is;
@@
-466,7
+466,7
@@
static struct pci_driver ioc4_driver = {
.name = "IOC4",
.id_table = ioc4_id_table,
.probe = ioc4_probe,
.name = "IOC4",
.id_table = ioc4_id_table,
.probe = ioc4_probe,
- .remove =
__devexit_p(ioc4_remove)
,
+ .remove =
ioc4_remove
,
};
MODULE_DEVICE_TABLE(pci, ioc4_id_table);
};
MODULE_DEVICE_TABLE(pci, ioc4_id_table);