lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[POWERPC] fsl_msi: few (mostly cosmetic) fixes

Browse Source 
This patch fixes few cosmetic issues, also removes unused function,
makes some functions static and reduces #ifdef count.

Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
This commit is contained in:
Anton Vorontsov
2008-05-23 17:41:02 +04:00
committed by Kumar Gala
parent 741edc4949
commit 692d1037e6
2 changed files with 21 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
arch/powerpc/sysdev/fsl_msi.c
View File

@@ -36,12 +36,6 @@ static inline u32 fsl_msi_read(u32 __iomem *base, unsigned int reg)
return in_be32(base + (reg >> 2)); return in_be32(base + (reg >> 2));
} }
static inline void fsl_msi_write(u32 __iomem *base,
unsigned int reg, u32 value)
{
out_be32(base + (reg >> 2), value);
}
/* /*
* We do not need this actually. The MSIR register has been read once * We do not need this actually. The MSIR register has been read once
* in the cascade interrupt. So, this MSI interrupt has been acked * in the cascade interrupt. So, this MSI interrupt has been acked
@@ -73,10 +67,11 @@ static struct irq_host_ops fsl_msi_host_ops = {
.map = fsl_msi_host_map, .map = fsl_msi_host_map,
}; };
irq_hw_number_t fsl_msi_alloc_hwirqs(struct fsl_msi *msi, int num) static irq_hw_number_t fsl_msi_alloc_hwirqs(struct fsl_msi *msi, int num)
{ {
unsigned long flags; unsigned long flags;
int offset, order = get_count_order(num); int order = get_count_order(num);
int offset;
spin_lock_irqsave(&msi->bitmap_lock, flags); spin_lock_irqsave(&msi->bitmap_lock, flags);
@@ -91,7 +86,7 @@ irq_hw_number_t fsl_msi_alloc_hwirqs(struct fsl_msi *msi, int num)
return offset; return offset;
} }
void fsl_msi_free_hwirqs(struct fsl_msi *msi, int offset, int num) static void fsl_msi_free_hwirqs(struct fsl_msi *msi, int offset, int num)
{ {
unsigned long flags; unsigned long flags;
int order = get_count_order(num); int order = get_count_order(num);
@@ -106,7 +101,8 @@ void fsl_msi_free_hwirqs(struct fsl_msi *msi, int offset, int num)
static int fsl_msi_free_dt_hwirqs(struct fsl_msi *msi) static int fsl_msi_free_dt_hwirqs(struct fsl_msi *msi)
{ {
int i, len; int i;
int len;
const u32 *p; const u32 *p;
bitmap_allocate_region(msi->fsl_msi_bitmap, 0, bitmap_allocate_region(msi->fsl_msi_bitmap, 0,
@@ -138,9 +134,8 @@ static int fsl_msi_free_dt_hwirqs(struct fsl_msi *msi)
static int fsl_msi_init_allocator(struct fsl_msi *msi_data) static int fsl_msi_init_allocator(struct fsl_msi *msi_data)
{ {
int rc, size; int rc;
int size = BITS_TO_LONGS(NR_MSI_IRQS) * sizeof(u32);
size = BITS_TO_LONGS(NR_MSI_IRQS) * sizeof(u32);
msi_data->fsl_msi_bitmap = kzalloc(size, GFP_KERNEL); msi_data->fsl_msi_bitmap = kzalloc(size, GFP_KERNEL);
@@ -238,7 +233,7 @@ out_free:
return rc; return rc;
} }
void fsl_msi_cascade(unsigned int irq, struct irq_desc *desc) static void fsl_msi_cascade(unsigned int irq, struct irq_desc *desc)
{ {
unsigned int cascade_irq; unsigned int cascade_irq;
struct fsl_msi *msi_data = fsl_msi; struct fsl_msi *msi_data = fsl_msi;
@@ -260,7 +255,7 @@ void fsl_msi_cascade(unsigned int irq, struct irq_desc *desc)
if (unlikely(desc->status & IRQ_INPROGRESS)) if (unlikely(desc->status & IRQ_INPROGRESS))
goto unlock; goto unlock;
msir_index = (int)(desc->handler_data); msir_index = (int)desc->handler_data;
if (msir_index >= NR_MSI_REG) if (msir_index >= NR_MSI_REG)
cascade_irq = NO_IRQ; cascade_irq = NO_IRQ;
@@ -280,12 +275,12 @@ void fsl_msi_cascade(unsigned int irq, struct irq_desc *desc)
intr_index = ffs(msir_value) - 1; intr_index = ffs(msir_value) - 1;
cascade_irq = irq_linear_revmap(msi_data->irqhost, cascade_irq = irq_linear_revmap(msi_data->irqhost,
(msir_index * IRQS_PER_MSI_REG + msir_index * IRQS_PER_MSI_REG +
intr_index + have_shift)); intr_index + have_shift);
if (cascade_irq != NO_IRQ) if (cascade_irq != NO_IRQ)
generic_handle_irq(cascade_irq); generic_handle_irq(cascade_irq);
have_shift += (intr_index + 1); have_shift += intr_index + 1;
msir_value = (msir_value >> (intr_index + 1)); msir_value = msir_value >> (intr_index + 1);
} }
desc->status &= ~IRQ_INPROGRESS; desc->status &= ~IRQ_INPROGRESS;
@@ -311,7 +306,7 @@ static int __devinit fsl_of_msi_probe(struct of_device *dev,
int rc; int rc;
int virt_msir; int virt_msir;
const u32 *p; const u32 *p;
struct fsl_msi_feature *tmp_data; struct fsl_msi_feature *features = match->data;
printk(KERN_DEBUG "Setting up Freescale MSI support\n"); printk(KERN_DEBUG "Setting up Freescale MSI support\n");
@@ -348,14 +343,12 @@ static int __devinit fsl_of_msi_probe(struct of_device *dev,
goto error_out; goto error_out;
} }
tmp_data = (struct fsl_msi_feature *)match->data; msi->feature = features->fsl_pic_ip;
msi->feature = tmp_data->fsl_pic_ip;
msi->irqhost->host_data = msi; msi->irqhost->host_data = msi;
msi->msi_addr_hi = 0x0; msi->msi_addr_hi = 0x0;
msi->msi_addr_lo = res.start + tmp_data->msiir_offset; msi->msi_addr_lo = res.start + features->msiir_offset;
rc = fsl_msi_init_allocator(msi); rc = fsl_msi_init_allocator(msi);
if (rc) { if (rc) {

8
arch/powerpc/sysdev/fsl_pci.c
View File

@@ -106,15 +106,15 @@ void __init setup_pci_cmd(struct pci_controller *hose)
} }
} }
#ifdef CONFIG_PCI_MSI static void __init setup_pci_pcsrbar(struct pci_controller *hose)
void __init setup_pci_pcsrbar(struct pci_controller *hose)
{ {
#ifdef CONFIG_PCI_MSI
phys_addr_t immr_base; phys_addr_t immr_base;
immr_base = get_immrbase(); immr_base = get_immrbase();
early_write_config_dword(hose, 0, 0, PCI_BASE_ADDRESS_0, immr_base); early_write_config_dword(hose, 0, 0, PCI_BASE_ADDRESS_0, immr_base);
}
#endif #endif
}
static int fsl_pcie_bus_fixup; static int fsl_pcie_bus_fixup;
@@ -222,9 +222,7 @@ int __init fsl_add_bridge(struct device_node *dev, int is_primary)
setup_pci_atmu(hose, &rsrc); setup_pci_atmu(hose, &rsrc);
/* Setup PEXCSRBAR */ /* Setup PEXCSRBAR */
#ifdef CONFIG_PCI_MSI
setup_pci_pcsrbar(hose); setup_pci_pcsrbar(hose);
#endif
return 0; return 0;
} }