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 'kvm-updates/2.6.39' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
pci_fire.c
diff --git
a/arch/sparc/kernel/pci_fire.c
b/arch/sparc/kernel/pci_fire.c
index
efb896d
..
3d70f83
100644
(file)
--- a/
arch/sparc/kernel/pci_fire.c
+++ b/
arch/sparc/kernel/pci_fire.c
@@
-214,11
+214,9
@@
static int pci_fire_msi_setup(struct pci_pbm_info *pbm, unsigned long msiqid,
static int pci_fire_msi_teardown(struct pci_pbm_info *pbm, unsigned long msi)
{
static int pci_fire_msi_teardown(struct pci_pbm_info *pbm, unsigned long msi)
{
- unsigned long msiqid;
u64 val;
val = upa_readq(pbm->pbm_regs + MSI_MAP(msi));
u64 val;
val = upa_readq(pbm->pbm_regs + MSI_MAP(msi));
- msiqid = (val & MSI_MAP_EQNUM);
val &= ~MSI_MAP_VALID;
val &= ~MSI_MAP_VALID;
@@
-277,7
+275,7
@@
static int pci_fire_msiq_build_irq(struct pci_pbm_info *pbm,
{
unsigned long cregs = (unsigned long) pbm->pbm_regs;
unsigned long imap_reg, iclr_reg, int_ctrlr;
{
unsigned long cregs = (unsigned long) pbm->pbm_regs;
unsigned long imap_reg, iclr_reg, int_ctrlr;
- unsigned int
virt_
irq;
+ unsigned int irq;
int fixup;
u64 val;
int fixup;
u64 val;
@@
-293,14
+291,14
@@
static int pci_fire_msiq_build_irq(struct pci_pbm_info *pbm,
fixup = ((pbm->portid << 6) | devino) - int_ctrlr;
fixup = ((pbm->portid << 6) | devino) - int_ctrlr;
-
virt_
irq = build_irq(fixup, iclr_reg, imap_reg);
- if (!
virt_
irq)
+ irq = build_irq(fixup, iclr_reg, imap_reg);
+ if (!irq)
return -ENOMEM;
upa_writeq(EVENT_QUEUE_CONTROL_SET_EN,
pbm->pbm_regs + EVENT_QUEUE_CONTROL_SET(msiqid));
return -ENOMEM;
upa_writeq(EVENT_QUEUE_CONTROL_SET_EN,
pbm->pbm_regs + EVENT_QUEUE_CONTROL_SET(msiqid));
- return
virt_
irq;
+ return irq;
}
static const struct sparc64_msiq_ops pci_fire_msiq_ops = {
}
static const struct sparc64_msiq_ops pci_fire_msiq_ops = {
@@
-455,8
+453,7
@@
static int __devinit pci_fire_pbm_init(struct pci_pbm_info *pbm,
return 0;
}
return 0;
}
-static int __devinit fire_probe(struct platform_device *op,
- const struct of_device_id *match)
+static int __devinit fire_probe(struct platform_device *op)
{
struct device_node *dp = op->dev.of_node;
struct pci_pbm_info *pbm;
{
struct device_node *dp = op->dev.of_node;
struct pci_pbm_info *pbm;
@@
-507,7
+504,7
@@
static struct of_device_id __initdata fire_match[] = {
{},
};
{},
};
-static struct
of_
platform_driver fire_driver = {
+static struct platform_driver fire_driver = {
.driver = {
.name = DRIVER_NAME,
.owner = THIS_MODULE,
.driver = {
.name = DRIVER_NAME,
.owner = THIS_MODULE,
@@
-518,7
+515,7
@@
static struct of_platform_driver fire_driver = {
static int __init fire_init(void)
{
static int __init fire_init(void)
{
- return
of_register_platform_driv
er(&fire_driver);
+ return
platform_driver_regist
er(&fire_driver);
}
subsys_initcall(fire_init);
}
subsys_initcall(fire_init);