projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fixes' into for-linus
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
sn
/
ioc3.c
diff --git
a/drivers/sn/ioc3.c
b/drivers/sn/ioc3.c
index 2dd6eed50aa06ef3721811d364d32086206ee437..a0aa33dde0a43dc36b1acbae9f9f22da5c39c065 100644
(file)
--- a/
drivers/sn/ioc3.c
+++ b/
drivers/sn/ioc3.c
@@
-561,7
+561,7
@@
void ioc3_unregister_submodule(struct ioc3_submodule *is)
printk(KERN_WARNING
"%s: IOC3 submodule %s remove failed "
"for pci_dev %s.\n",
printk(KERN_WARNING
"%s: IOC3 submodule %s remove failed "
"for pci_dev %s.\n",
- __
FUNCTION
__, module_name(is->owner),
+ __
func
__, module_name(is->owner),
pci_name(idd->pdev));
idd->active[is->id] = 0;
if(is->irq_mask)
pci_name(idd->pdev));
idd->active[is->id] = 0;
if(is->irq_mask)
@@
-611,7
+611,7
@@
static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
if ((ret = pci_enable_device(pdev))) {
printk(KERN_WARNING
"%s: Failed to enable IOC3 device for pci_dev %s.\n",
if ((ret = pci_enable_device(pdev))) {
printk(KERN_WARNING
"%s: Failed to enable IOC3 device for pci_dev %s.\n",
- __
FUNCTION
__, pci_name(pdev));
+ __
func
__, pci_name(pdev));
goto out;
}
pci_set_master(pdev);
goto out;
}
pci_set_master(pdev);
@@
-623,21
+623,20
@@
static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
if (ret < 0) {
printk(KERN_WARNING "%s: Unable to obtain 64 bit DMA "
"for consistent allocations\n",
if (ret < 0) {
printk(KERN_WARNING "%s: Unable to obtain 64 bit DMA "
"for consistent allocations\n",
- __
FUNCTION
__);
+ __
func
__);
}
}
#endif
/* Set up per-IOC3 data */
}
}
#endif
/* Set up per-IOC3 data */
- idd = k
m
alloc(sizeof(struct ioc3_driver_data), GFP_KERNEL);
+ idd = k
z
alloc(sizeof(struct ioc3_driver_data), GFP_KERNEL);
if (!idd) {
printk(KERN_WARNING
"%s: Failed to allocate IOC3 data for pci_dev %s.\n",
if (!idd) {
printk(KERN_WARNING
"%s: Failed to allocate IOC3 data for pci_dev %s.\n",
- __
FUNCTION
__, pci_name(pdev));
+ __
func
__, pci_name(pdev));
ret = -ENODEV;
goto out_idd;
}
ret = -ENODEV;
goto out_idd;
}
- memset(idd, 0, sizeof(struct ioc3_driver_data));
spin_lock_init(&idd->ir_lock);
spin_lock_init(&idd->gpio_lock);
idd->pdev = pdev;
spin_lock_init(&idd->ir_lock);
spin_lock_init(&idd->gpio_lock);
idd->pdev = pdev;
@@
-650,7
+649,7
@@
static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
printk(KERN_WARNING
"%s: Unable to find IOC3 resource "
"for pci_dev %s.\n",
printk(KERN_WARNING
"%s: Unable to find IOC3 resource "
"for pci_dev %s.\n",
- __
FUNCTION
__, pci_name(pdev));
+ __
func
__, pci_name(pdev));
ret = -ENODEV;
goto out_pci;
}
ret = -ENODEV;
goto out_pci;
}
@@
-658,7
+657,7
@@
static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
printk(KERN_WARNING
"%s: Unable to request IOC3 region "
"for pci_dev %s.\n",
printk(KERN_WARNING
"%s: Unable to request IOC3 region "
"for pci_dev %s.\n",
- __
FUNCTION
__, pci_name(pdev));
+ __
func
__, pci_name(pdev));
ret = -ENODEV;
goto out_pci;
}
ret = -ENODEV;
goto out_pci;
}
@@
-667,7
+666,7
@@
static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
printk(KERN_WARNING
"%s: Unable to remap IOC3 region "
"for pci_dev %s.\n",
printk(KERN_WARNING
"%s: Unable to remap IOC3 region "
"for pci_dev %s.\n",
- __
FUNCTION
__, pci_name(pdev));
+ __
func
__, pci_name(pdev));
ret = -ENODEV;
goto out_misc_region;
}
ret = -ENODEV;
goto out_misc_region;
}
@@
-710,7
+709,7
@@
static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
} else {
printk(KERN_WARNING
"%s : request_irq fails for IRQ 0x%x\n ",
} else {
printk(KERN_WARNING
"%s : request_irq fails for IRQ 0x%x\n ",
- __
FUNCTION
__, pdev->irq);
+ __
func
__, pdev->irq);
}
if (!request_irq(pdev->irq+2, ioc3_intr_io, IRQF_SHARED,
"ioc3-io", (void *)idd)) {
}
if (!request_irq(pdev->irq+2, ioc3_intr_io, IRQF_SHARED,
"ioc3-io", (void *)idd)) {
@@
-718,7
+717,7
@@
static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
} else {
printk(KERN_WARNING
"%s : request_irq fails for IRQ 0x%x\n ",
} else {
printk(KERN_WARNING
"%s : request_irq fails for IRQ 0x%x\n ",
- __
FUNCTION
__, pdev->irq+2);
+ __
func
__, pdev->irq+2);
}
} else {
if (!request_irq(pdev->irq, ioc3_intr_io, IRQF_SHARED,
}
} else {
if (!request_irq(pdev->irq, ioc3_intr_io, IRQF_SHARED,
@@
-727,7
+726,7
@@
static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *pci_id)
} else {
printk(KERN_WARNING
"%s : request_irq fails for IRQ 0x%x\n ",
} else {
printk(KERN_WARNING
"%s : request_irq fails for IRQ 0x%x\n ",
- __
FUNCTION
__, pdev->irq);
+ __
func
__, pdev->irq);
}
}
}
}
@@
-770,7
+769,7
@@
static void ioc3_remove(struct pci_dev *pdev)
printk(KERN_WARNING
"%s: IOC3 submodule 0x%s remove failed "
"for pci_dev %s.\n",
printk(KERN_WARNING
"%s: IOC3 submodule 0x%s remove failed "
"for pci_dev %s.\n",
- __
FUNCTION
__,
+ __
func
__,
module_name(ioc3_submodules[id]->owner),
pci_name(pdev));
idd->active[id] = 0;
module_name(ioc3_submodules[id]->owner),
pci_name(pdev));
idd->active[id] = 0;