Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ea6ba10b authored by Jeff Garzik's avatar Jeff Garzik
Browse files

[libata] __iomem annotations for various drivers

parent e005f01d

drivers/scsi/ahci.c

+17 −16
Original line number Diff line number Diff line
@@ -294,9 +294,9 @@ static inline unsigned long ahci_port_base_ul (unsigned long base, unsigned int 
	return base + 0x100 + (port * 0x80);

}



static inline void *ahci_port_base (void *base, unsigned int port)

static inline void __iomem *ahci_port_base (void __iomem *base, unsigned int port)

{

	return (void *) ahci_port_base_ul((unsigned long)base, port);

	return (void __iomem *) ahci_port_base_ul((unsigned long)base, port);

}



static int ahci_port_start(struct ata_port *ap)
@@ -304,8 +304,9 @@ static int ahci_port_start(struct ata_port *ap) 
	struct device *dev = ap->host_set->dev;

	struct ahci_host_priv *hpriv = ap->host_set->private_data;

	struct ahci_port_priv *pp;

	void *mem, *mmio = ap->host_set->mmio_base;

	void *port_mmio = ahci_port_base(mmio, ap->port_no);

	void __iomem *mmio = ap->host_set->mmio_base;

	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);

	void *mem;

	dma_addr_t mem_dma;



	pp = kmalloc(sizeof(*pp), GFP_KERNEL);
@@ -373,8 +374,8 @@ static void ahci_port_stop(struct ata_port *ap) 
{

	struct device *dev = ap->host_set->dev;

	struct ahci_port_priv *pp = ap->private_data;

	void *mmio = ap->host_set->mmio_base;

	void *port_mmio = ahci_port_base(mmio, ap->port_no);

	void __iomem *mmio = ap->host_set->mmio_base;

	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);

	u32 tmp;



	tmp = readl(port_mmio + PORT_CMD);
@@ -536,8 +537,8 @@ static void ahci_qc_prep(struct ata_queued_cmd *qc) 


static void ahci_intr_error(struct ata_port *ap, u32 irq_stat)

{

	void *mmio = ap->host_set->mmio_base;

	void *port_mmio = ahci_port_base(mmio, ap->port_no);

	void __iomem *mmio = ap->host_set->mmio_base;

	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);

	u32 tmp;

	int work;
@@ -585,8 +586,8 @@ static void ahci_intr_error(struct ata_port *ap, u32 irq_stat) 
static void ahci_eng_timeout(struct ata_port *ap)

{

	struct ata_host_set *host_set = ap->host_set;

	void *mmio = host_set->mmio_base;

	void *port_mmio = ahci_port_base(mmio, ap->port_no);

	void __iomem *mmio = host_set->mmio_base;

	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);

	struct ata_queued_cmd *qc;

	unsigned long flags;
@@ -616,8 +617,8 @@ static void ahci_eng_timeout(struct ata_port *ap) 


static inline int ahci_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc)

{

	void *mmio = ap->host_set->mmio_base;

	void *port_mmio = ahci_port_base(mmio, ap->port_no);

	void __iomem *mmio = ap->host_set->mmio_base;

	void __iomem *port_mmio = ahci_port_base(mmio, ap->port_no);

	u32 status, serr, ci;



	serr = readl(port_mmio + PORT_SCR_ERR);
@@ -653,7 +654,7 @@ static irqreturn_t ahci_interrupt (int irq, void *dev_instance, struct pt_regs * 
	struct ata_host_set *host_set = dev_instance;

	struct ahci_host_priv *hpriv;

	unsigned int i, handled = 0;

	void *mmio;

	void __iomem *mmio;

	u32 irq_stat, irq_ack = 0;



	VPRINTK("ENTER\n");
@@ -699,7 +700,7 @@ static irqreturn_t ahci_interrupt (int irq, void *dev_instance, struct pt_regs * 
static int ahci_qc_issue(struct ata_queued_cmd *qc)

{

	struct ata_port *ap = qc->ap;

	void *port_mmio = (void *) ap->ioaddr.cmd_addr;

	void __iomem *port_mmio = (void __iomem *) ap->ioaddr.cmd_addr;



	writel(1, port_mmio + PORT_CMD_ISSUE);

	readl(port_mmio + PORT_CMD_ISSUE);	/* flush */
@@ -884,7 +885,7 @@ static void ahci_print_info(struct ata_probe_ent *probe_ent) 
{

	struct ahci_host_priv *hpriv = probe_ent->private_data;

	struct pci_dev *pdev = to_pci_dev(probe_ent->dev);

	void *mmio = probe_ent->mmio_base;

	void __iomem *mmio = probe_ent->mmio_base;

	u32 vers, cap, impl, speed;

	const char *speed_s;

	u16 cc;
@@ -957,7 +958,7 @@ static int ahci_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) 
	struct ata_probe_ent *probe_ent = NULL;

	struct ahci_host_priv *hpriv;

	unsigned long base;

	void *mmio_base;

	void __iomem *mmio_base;

	unsigned int board_idx = (unsigned int) ent->driver_data;

	int have_msi, pci_dev_busy = 0;

	int rc;

drivers/scsi/ata_piix.c

+1 −1
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ static void pci_enable_intx(struct pci_dev *pdev) 
#define AHCI_ENABLE (1 << 31)

static int piix_disable_ahci(struct pci_dev *pdev)

{

	void *mmio;

	void __iomem *mmio;

	unsigned long addr;

	u32 tmp;

	int rc = 0;

drivers/scsi/sata_promise.c

+6 −6
Original line number Diff line number Diff line
@@ -282,7 +282,7 @@ static void pdc_port_stop(struct ata_port *ap) 


static void pdc_reset_port(struct ata_port *ap)

{

	void *mmio = (void *) ap->ioaddr.cmd_addr + PDC_CTLSTAT;

	void __iomem *mmio = (void __iomem *) ap->ioaddr.cmd_addr + PDC_CTLSTAT;

	unsigned int i;

	u32 tmp;
@@ -418,7 +418,7 @@ static inline unsigned int pdc_host_intr( struct ata_port *ap, 
	u8 status;

	unsigned int handled = 0, have_err = 0;

	u32 tmp;

	void *mmio = (void *) ap->ioaddr.cmd_addr + PDC_GLOBAL_CTL;

	void __iomem *mmio = (void __iomem *) ap->ioaddr.cmd_addr + PDC_GLOBAL_CTL;



	tmp = readl(mmio);

	if (tmp & PDC_ERR_MASK) {
@@ -447,7 +447,7 @@ static inline unsigned int pdc_host_intr( struct ata_port *ap, 
static void pdc_irq_clear(struct ata_port *ap)

{

	struct ata_host_set *host_set = ap->host_set;

	void *mmio = host_set->mmio_base;

	void __iomem *mmio = host_set->mmio_base;



	readl(mmio + PDC_INT_SEQMASK);

}
@@ -459,7 +459,7 @@ static irqreturn_t pdc_interrupt (int irq, void *dev_instance, struct pt_regs *r 
	u32 mask = 0;

	unsigned int i, tmp;

	unsigned int handled = 0;

	void *mmio_base;

	void __iomem *mmio_base;



	VPRINTK("ENTER\n");
@@ -581,7 +581,7 @@ static void pdc_ata_setup_port(struct ata_ioports *port, unsigned long base) 


static void pdc_host_init(unsigned int chip_id, struct ata_probe_ent *pe)

{

	void *mmio = pe->mmio_base;

	void __iomem *mmio = pe->mmio_base;

	u32 tmp;



	/*
@@ -624,7 +624,7 @@ static int pdc_ata_init_one (struct pci_dev *pdev, const struct pci_device_id *e 
	static int printed_version;

	struct ata_probe_ent *probe_ent = NULL;

	unsigned long base;

	void *mmio_base;

	void __iomem *mmio_base;

	unsigned int board_idx = (unsigned int) ent->driver_data;

	int pci_dev_busy = 0;

	int rc;

drivers/scsi/sata_sil.c

+3 −2
Original line number Diff line number Diff line
@@ -242,7 +242,8 @@ static void sil_post_set_mode (struct ata_port *ap) 
{

	struct ata_host_set *host_set = ap->host_set;

	struct ata_device *dev;

	void *addr = host_set->mmio_base + sil_port[ap->port_no].xfer_mode;

	void __iomem *addr =

		host_set->mmio_base + sil_port[ap->port_no].xfer_mode;

	u32 tmp, dev_mode[2];

	unsigned int i;
@@ -375,7 +376,7 @@ static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) 
	static int printed_version;

	struct ata_probe_ent *probe_ent = NULL;

	unsigned long base;

	void *mmio_base;

	void __iomem *mmio_base;

	int rc;

	unsigned int i;

	int pci_dev_busy = 0;

drivers/scsi/sata_svw.c

+1 −1
Original line number Diff line number Diff line
@@ -346,7 +346,7 @@ static int k2_sata_init_one (struct pci_dev *pdev, const struct pci_device_id *e 
	static int printed_version;

	struct ata_probe_ent *probe_ent = NULL;

	unsigned long base;

	void *mmio_base;

	void __iomem *mmio_base;

	int pci_dev_busy = 0;

	int rc;

	int i;