Skip to content

L
linux
Commit 5cbebc06 authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds
Browse files
Options

[PATCH] DAC960 iomem annotations 

Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 7696b632
Expand all Show whitespace changes
Inline Side-by-side
Showing with 111 additions and 111 deletions
drivers/block/DAC960.c
View file @ 5cbebc06
...@@ -540,7 +540,7 @@ static void DAC960_WaitForCommand(DAC960_Controller_T *Controller) ...@@ -540,7 +540,7 @@ static void DAC960_WaitForCommand(DAC960_Controller_T *Controller)
static void DAC960_BA_QueueCommand(DAC960_Command_T *Command) static void DAC960_BA_QueueCommand(DAC960_Command_T *Command)
{ {
DAC960_Controller_T *Controller = Command->Controller; DAC960_Controller_T *Controller = Command->Controller;
void *ControllerBaseAddress = Controller->BaseAddress; void __iomem *ControllerBaseAddress = Controller->BaseAddress;
DAC960_V2_CommandMailbox_T *CommandMailbox = &Command->V2.CommandMailbox; DAC960_V2_CommandMailbox_T *CommandMailbox = &Command->V2.CommandMailbox;
DAC960_V2_CommandMailbox_T *NextCommandMailbox = DAC960_V2_CommandMailbox_T *NextCommandMailbox =
Controller->V2.NextCommandMailbox; Controller->V2.NextCommandMailbox;
...@@ -565,7 +565,7 @@ static void DAC960_BA_QueueCommand(DAC960_Command_T *Command) ...@@ -565,7 +565,7 @@ static void DAC960_BA_QueueCommand(DAC960_Command_T *Command)
static void DAC960_LP_QueueCommand(DAC960_Command_T *Command) static void DAC960_LP_QueueCommand(DAC960_Command_T *Command)
{ {
DAC960_Controller_T *Controller = Command->Controller; DAC960_Controller_T *Controller = Command->Controller;
void *ControllerBaseAddress = Controller->BaseAddress; void __iomem *ControllerBaseAddress = Controller->BaseAddress;
DAC960_V2_CommandMailbox_T *CommandMailbox = &Command->V2.CommandMailbox; DAC960_V2_CommandMailbox_T *CommandMailbox = &Command->V2.CommandMailbox;
DAC960_V2_CommandMailbox_T *NextCommandMailbox = DAC960_V2_CommandMailbox_T *NextCommandMailbox =
Controller->V2.NextCommandMailbox; Controller->V2.NextCommandMailbox;
...@@ -591,7 +591,7 @@ static void DAC960_LP_QueueCommand(DAC960_Command_T *Command) ...@@ -591,7 +591,7 @@ static void DAC960_LP_QueueCommand(DAC960_Command_T *Command)
static void DAC960_LA_QueueCommandDualMode(DAC960_Command_T *Command) static void DAC960_LA_QueueCommandDualMode(DAC960_Command_T *Command)
{ {
DAC960_Controller_T *Controller = Command->Controller; DAC960_Controller_T *Controller = Command->Controller;
void *ControllerBaseAddress = Controller->BaseAddress; void __iomem *ControllerBaseAddress = Controller->BaseAddress;
DAC960_V1_CommandMailbox_T *CommandMailbox = &Command->V1.CommandMailbox; DAC960_V1_CommandMailbox_T *CommandMailbox = &Command->V1.CommandMailbox;
DAC960_V1_CommandMailbox_T *NextCommandMailbox = DAC960_V1_CommandMailbox_T *NextCommandMailbox =
Controller->V1.NextCommandMailbox; Controller->V1.NextCommandMailbox;
...@@ -617,7 +617,7 @@ static void DAC960_LA_QueueCommandDualMode(DAC960_Command_T *Command) ...@@ -617,7 +617,7 @@ static void DAC960_LA_QueueCommandDualMode(DAC960_Command_T *Command)
static void DAC960_LA_QueueCommandSingleMode(DAC960_Command_T *Command) static void DAC960_LA_QueueCommandSingleMode(DAC960_Command_T *Command)
{ {
DAC960_Controller_T *Controller = Command->Controller; DAC960_Controller_T *Controller = Command->Controller;
void *ControllerBaseAddress = Controller->BaseAddress; void __iomem *ControllerBaseAddress = Controller->BaseAddress;
DAC960_V1_CommandMailbox_T *CommandMailbox = &Command->V1.CommandMailbox; DAC960_V1_CommandMailbox_T *CommandMailbox = &Command->V1.CommandMailbox;
DAC960_V1_CommandMailbox_T *NextCommandMailbox = DAC960_V1_CommandMailbox_T *NextCommandMailbox =
Controller->V1.NextCommandMailbox; Controller->V1.NextCommandMailbox;
...@@ -643,7 +643,7 @@ static void DAC960_LA_QueueCommandSingleMode(DAC960_Command_T *Command) ...@@ -643,7 +643,7 @@ static void DAC960_LA_QueueCommandSingleMode(DAC960_Command_T *Command)
static void DAC960_PG_QueueCommandDualMode(DAC960_Command_T *Command) static void DAC960_PG_QueueCommandDualMode(DAC960_Command_T *Command)
{ {
DAC960_Controller_T *Controller = Command->Controller; DAC960_Controller_T *Controller = Command->Controller;
void *ControllerBaseAddress = Controller->BaseAddress; void __iomem *ControllerBaseAddress = Controller->BaseAddress;
DAC960_V1_CommandMailbox_T *CommandMailbox = &Command->V1.CommandMailbox; DAC960_V1_CommandMailbox_T *CommandMailbox = &Command->V1.CommandMailbox;
DAC960_V1_CommandMailbox_T *NextCommandMailbox = DAC960_V1_CommandMailbox_T *NextCommandMailbox =
Controller->V1.NextCommandMailbox; Controller->V1.NextCommandMailbox;
...@@ -669,7 +669,7 @@ static void DAC960_PG_QueueCommandDualMode(DAC960_Command_T *Command) ...@@ -669,7 +669,7 @@ static void DAC960_PG_QueueCommandDualMode(DAC960_Command_T *Command)
static void DAC960_PG_QueueCommandSingleMode(DAC960_Command_T *Command) static void DAC960_PG_QueueCommandSingleMode(DAC960_Command_T *Command)
{ {
DAC960_Controller_T *Controller = Command->Controller; DAC960_Controller_T *Controller = Command->Controller;
void *ControllerBaseAddress = Controller->BaseAddress; void __iomem *ControllerBaseAddress = Controller->BaseAddress;
DAC960_V1_CommandMailbox_T *CommandMailbox = &Command->V1.CommandMailbox; DAC960_V1_CommandMailbox_T *CommandMailbox = &Command->V1.CommandMailbox;
DAC960_V1_CommandMailbox_T *NextCommandMailbox = DAC960_V1_CommandMailbox_T *NextCommandMailbox =
Controller->V1.NextCommandMailbox; Controller->V1.NextCommandMailbox;
...@@ -694,7 +694,7 @@ static void DAC960_PG_QueueCommandSingleMode(DAC960_Command_T *Command) ...@@ -694,7 +694,7 @@ static void DAC960_PG_QueueCommandSingleMode(DAC960_Command_T *Command)
static void DAC960_PD_QueueCommand(DAC960_Command_T *Command) static void DAC960_PD_QueueCommand(DAC960_Command_T *Command)
{ {
DAC960_Controller_T *Controller = Command->Controller; DAC960_Controller_T *Controller = Command->Controller;
void *ControllerBaseAddress = Controller->BaseAddress; void __iomem *ControllerBaseAddress = Controller->BaseAddress;
DAC960_V1_CommandMailbox_T *CommandMailbox = &Command->V1.CommandMailbox; DAC960_V1_CommandMailbox_T *CommandMailbox = &Command->V1.CommandMailbox;
CommandMailbox->Common.CommandIdentifier = Command->CommandIdentifier; CommandMailbox->Common.CommandIdentifier = Command->CommandIdentifier;
while (DAC960_PD_MailboxFullP(ControllerBaseAddress)) while (DAC960_PD_MailboxFullP(ControllerBaseAddress))
...@@ -711,7 +711,7 @@ static void DAC960_PD_QueueCommand(DAC960_Command_T *Command) ...@@ -711,7 +711,7 @@ static void DAC960_PD_QueueCommand(DAC960_Command_T *Command)
static void DAC960_P_QueueCommand(DAC960_Command_T *Command) static void DAC960_P_QueueCommand(DAC960_Command_T *Command)
{ {
DAC960_Controller_T *Controller = Command->Controller; DAC960_Controller_T *Controller = Command->Controller;
void *ControllerBaseAddress = Controller->BaseAddress; void __iomem *ControllerBaseAddress = Controller->BaseAddress;
DAC960_V1_CommandMailbox_T *CommandMailbox = &Command->V1.CommandMailbox; DAC960_V1_CommandMailbox_T *CommandMailbox = &Command->V1.CommandMailbox;
CommandMailbox->Common.CommandIdentifier = Command->CommandIdentifier; CommandMailbox->Common.CommandIdentifier = Command->CommandIdentifier;
switch (CommandMailbox->Common.CommandOpcode) switch (CommandMailbox->Common.CommandOpcode)
...@@ -1132,7 +1132,7 @@ static boolean DAC960_V2_DeviceOperation(DAC960_Controller_T *Controller, ...@@ -1132,7 +1132,7 @@ static boolean DAC960_V2_DeviceOperation(DAC960_Controller_T *Controller,
static boolean DAC960_V1_EnableMemoryMailboxInterface(DAC960_Controller_T static boolean DAC960_V1_EnableMemoryMailboxInterface(DAC960_Controller_T
*Controller) *Controller)
{ {
void *ControllerBaseAddress = Controller->BaseAddress; void __iomem *ControllerBaseAddress = Controller->BaseAddress;
DAC960_HardwareType_T hw_type = Controller->HardwareType; DAC960_HardwareType_T hw_type = Controller->HardwareType;
struct pci_dev *PCI_Device = Controller->PCIDevice; struct pci_dev *PCI_Device = Controller->PCIDevice;
struct dma_loaf *DmaPages = &Controller->DmaPages; struct dma_loaf *DmaPages = &Controller->DmaPages;
...@@ -1338,7 +1338,7 @@ static boolean DAC960_V1_EnableMemoryMailboxInterface(DAC960_Controller_T ...@@ -1338,7 +1338,7 @@ static boolean DAC960_V1_EnableMemoryMailboxInterface(DAC960_Controller_T
static boolean DAC960_V2_EnableMemoryMailboxInterface(DAC960_Controller_T static boolean DAC960_V2_EnableMemoryMailboxInterface(DAC960_Controller_T
*Controller) *Controller)
{ {
void *ControllerBaseAddress = Controller->BaseAddress; void __iomem *ControllerBaseAddress = Controller->BaseAddress;
struct pci_dev *PCI_Device = Controller->PCIDevice; struct pci_dev *PCI_Device = Controller->PCIDevice;
struct dma_loaf *DmaPages = &Controller->DmaPages; struct dma_loaf *DmaPages = &Controller->DmaPages;
size_t DmaPagesSize; size_t DmaPagesSize;
...@@ -2679,7 +2679,7 @@ DAC960_DetectController(struct pci_dev *PCI_Device, ...@@ -2679,7 +2679,7 @@ DAC960_DetectController(struct pci_dev *PCI_Device,
unsigned char DeviceFunction = PCI_Device->devfn; unsigned char DeviceFunction = PCI_Device->devfn;
unsigned char ErrorStatus, Parameter0, Parameter1; unsigned char ErrorStatus, Parameter0, Parameter1;
unsigned int IRQ_Channel = PCI_Device->irq; unsigned int IRQ_Channel = PCI_Device->irq;
void *BaseAddress; void __iomem *BaseAddress;
int i; int i;
Controller = (DAC960_Controller_T *) Controller = (DAC960_Controller_T *)
...@@ -5201,7 +5201,7 @@ static irqreturn_t DAC960_BA_InterruptHandler(int IRQ_Channel, ...@@ -5201,7 +5201,7 @@ static irqreturn_t DAC960_BA_InterruptHandler(int IRQ_Channel,
struct pt_regs *InterruptRegisters) struct pt_regs *InterruptRegisters)
{ {
DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier; DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier;
void *ControllerBaseAddress = Controller->BaseAddress; void __iomem *ControllerBaseAddress = Controller->BaseAddress;
DAC960_V2_StatusMailbox_T *NextStatusMailbox; DAC960_V2_StatusMailbox_T *NextStatusMailbox;
unsigned long flags; unsigned long flags;
...@@ -5244,7 +5244,7 @@ static irqreturn_t DAC960_LP_InterruptHandler(int IRQ_Channel, ...@@ -5244,7 +5244,7 @@ static irqreturn_t DAC960_LP_InterruptHandler(int IRQ_Channel,
struct pt_regs *InterruptRegisters) struct pt_regs *InterruptRegisters)
{ {
DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier; DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier;
void *ControllerBaseAddress = Controller->BaseAddress; void __iomem *ControllerBaseAddress = Controller->BaseAddress;
DAC960_V2_StatusMailbox_T *NextStatusMailbox; DAC960_V2_StatusMailbox_T *NextStatusMailbox;
unsigned long flags; unsigned long flags;
...@@ -5287,7 +5287,7 @@ static irqreturn_t DAC960_LA_InterruptHandler(int IRQ_Channel, ...@@ -5287,7 +5287,7 @@ static irqreturn_t DAC960_LA_InterruptHandler(int IRQ_Channel,
struct pt_regs *InterruptRegisters) struct pt_regs *InterruptRegisters)
{ {
DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier; DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier;
void *ControllerBaseAddress = Controller->BaseAddress; void __iomem *ControllerBaseAddress = Controller->BaseAddress;
DAC960_V1_StatusMailbox_T *NextStatusMailbox; DAC960_V1_StatusMailbox_T *NextStatusMailbox;
unsigned long flags; unsigned long flags;
...@@ -5326,7 +5326,7 @@ static irqreturn_t DAC960_PG_InterruptHandler(int IRQ_Channel, ...@@ -5326,7 +5326,7 @@ static irqreturn_t DAC960_PG_InterruptHandler(int IRQ_Channel,
struct pt_regs *InterruptRegisters) struct pt_regs *InterruptRegisters)
{ {
DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier; DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier;
void *ControllerBaseAddress = Controller->BaseAddress; void __iomem *ControllerBaseAddress = Controller->BaseAddress;
DAC960_V1_StatusMailbox_T *NextStatusMailbox; DAC960_V1_StatusMailbox_T *NextStatusMailbox;
unsigned long flags; unsigned long flags;
...@@ -5365,7 +5365,7 @@ static irqreturn_t DAC960_PD_InterruptHandler(int IRQ_Channel, ...@@ -5365,7 +5365,7 @@ static irqreturn_t DAC960_PD_InterruptHandler(int IRQ_Channel,
struct pt_regs *InterruptRegisters) struct pt_regs *InterruptRegisters)
{ {
DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier; DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier;
void *ControllerBaseAddress = Controller->BaseAddress; void __iomem *ControllerBaseAddress = Controller->BaseAddress;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&Controller->queue_lock, flags); spin_lock_irqsave(&Controller->queue_lock, flags);
...@@ -5404,7 +5404,7 @@ static irqreturn_t DAC960_P_InterruptHandler(int IRQ_Channel, ...@@ -5404,7 +5404,7 @@ static irqreturn_t DAC960_P_InterruptHandler(int IRQ_Channel,
struct pt_regs *InterruptRegisters) struct pt_regs *InterruptRegisters)
{ {
DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier; DAC960_Controller_T *Controller = (DAC960_Controller_T *) DeviceIdentifier;
void *ControllerBaseAddress = Controller->BaseAddress; void __iomem *ControllerBaseAddress = Controller->BaseAddress;
unsigned long flags; unsigned long flags;
spin_lock_irqsave(&Controller->queue_lock, flags); spin_lock_irqsave(&Controller->queue_lock, flags);
......
drivers/block/DAC960.h
View file @ 5cbebc06
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7