|
@@ -191,7 +191,7 @@ struct grpci2_cap_first {
|
|
|
|
|
|
struct grpci2_priv {
|
|
struct grpci2_priv {
|
|
struct leon_pci_info info; /* must be on top of this structure */
|
|
struct leon_pci_info info; /* must be on top of this structure */
|
|
- struct grpci2_regs *regs;
|
|
|
|
|
|
+ struct grpci2_regs __iomem *regs;
|
|
char irq;
|
|
char irq;
|
|
char irq_mode; /* IRQ Mode from CAPSTS REG */
|
|
char irq_mode; /* IRQ Mode from CAPSTS REG */
|
|
char bt_enabled;
|
|
char bt_enabled;
|
|
@@ -215,10 +215,10 @@ struct grpci2_priv {
|
|
struct grpci2_barcfg tgtbars[6];
|
|
struct grpci2_barcfg tgtbars[6];
|
|
};
|
|
};
|
|
|
|
|
|
-DEFINE_SPINLOCK(grpci2_dev_lock);
|
|
|
|
-struct grpci2_priv *grpci2priv;
|
|
|
|
|
|
+static DEFINE_SPINLOCK(grpci2_dev_lock);
|
|
|
|
+static struct grpci2_priv *grpci2priv;
|
|
|
|
|
|
-int grpci2_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
|
|
|
|
|
+static int grpci2_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
|
|
{
|
|
{
|
|
struct grpci2_priv *priv = dev->bus->sysdata;
|
|
struct grpci2_priv *priv = dev->bus->sysdata;
|
|
int irq_group;
|
|
int irq_group;
|
|
@@ -561,10 +561,10 @@ out:
|
|
return virq;
|
|
return virq;
|
|
}
|
|
}
|
|
|
|
|
|
-void grpci2_hw_init(struct grpci2_priv *priv)
|
|
|
|
|
|
+static void grpci2_hw_init(struct grpci2_priv *priv)
|
|
{
|
|
{
|
|
u32 ahbadr, pciadr, bar_sz, capptr, io_map, data;
|
|
u32 ahbadr, pciadr, bar_sz, capptr, io_map, data;
|
|
- struct grpci2_regs *regs = priv->regs;
|
|
|
|
|
|
+ struct grpci2_regs __iomem *regs = priv->regs;
|
|
int i;
|
|
int i;
|
|
struct grpci2_barcfg *barcfg = priv->tgtbars;
|
|
struct grpci2_barcfg *barcfg = priv->tgtbars;
|
|
|
|
|
|
@@ -655,7 +655,7 @@ static irqreturn_t grpci2_jump_interrupt(int irq, void *arg)
|
|
static irqreturn_t grpci2_err_interrupt(int irq, void *arg)
|
|
static irqreturn_t grpci2_err_interrupt(int irq, void *arg)
|
|
{
|
|
{
|
|
struct grpci2_priv *priv = arg;
|
|
struct grpci2_priv *priv = arg;
|
|
- struct grpci2_regs *regs = priv->regs;
|
|
|
|
|
|
+ struct grpci2_regs __iomem *regs = priv->regs;
|
|
unsigned int status;
|
|
unsigned int status;
|
|
|
|
|
|
status = REGLOAD(regs->sts_cap);
|
|
status = REGLOAD(regs->sts_cap);
|
|
@@ -682,7 +682,7 @@ static irqreturn_t grpci2_err_interrupt(int irq, void *arg)
|
|
|
|
|
|
static int grpci2_of_probe(struct platform_device *ofdev)
|
|
static int grpci2_of_probe(struct platform_device *ofdev)
|
|
{
|
|
{
|
|
- struct grpci2_regs *regs;
|
|
|
|
|
|
+ struct grpci2_regs __iomem *regs;
|
|
struct grpci2_priv *priv;
|
|
struct grpci2_priv *priv;
|
|
int err, i, len;
|
|
int err, i, len;
|
|
const int *tmp;
|
|
const int *tmp;
|
|
@@ -878,7 +878,7 @@ err4:
|
|
release_resource(&priv->info.mem_space);
|
|
release_resource(&priv->info.mem_space);
|
|
err3:
|
|
err3:
|
|
err = -ENOMEM;
|
|
err = -ENOMEM;
|
|
- iounmap((void *)priv->pci_io_va);
|
|
|
|
|
|
+ iounmap((void __iomem *)priv->pci_io_va);
|
|
err2:
|
|
err2:
|
|
kfree(priv);
|
|
kfree(priv);
|
|
err1:
|
|
err1:
|