Skip to content

L
linux
Commit dc1bd315 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

[PATCH] PCI Hotplug: fix __iomem warnings in the ibm pci hotplug driver 

Signed-off-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
parent ad439c6d
Show whitespace changes
Inline Side-by-side
Showing with 15 additions and 15 deletions
drivers/pci/hotplug/ibmphp_ebda.c
View file @ dc1bd315
...@@ -63,7 +63,7 @@ static LIST_HEAD (rio_vg_head); ...@@ -63,7 +63,7 @@ static LIST_HEAD (rio_vg_head);
static LIST_HEAD (rio_lo_head); static LIST_HEAD (rio_lo_head);
static LIST_HEAD (opt_vg_head); static LIST_HEAD (opt_vg_head);
static LIST_HEAD (opt_lo_head); static LIST_HEAD (opt_lo_head);
static void *io_mem; static void __iomem *io_mem;
/* Local functions */ /* Local functions */
static int ebda_rsrc_controller (void); static int ebda_rsrc_controller (void);
......
drivers/pci/hotplug/ibmphp_hpc.c
View file @ dc1bd315
...@@ -108,8 +108,8 @@ static struct semaphore sem_exit; // make sure polling thread goes away ...@@ -108,8 +108,8 @@ static struct semaphore sem_exit; // make sure polling thread goes away
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
// local function prototypes // local function prototypes
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
static u8 i2c_ctrl_read (struct controller *, void *, u8); static u8 i2c_ctrl_read (struct controller *, void __iomem *, u8);
static u8 i2c_ctrl_write (struct controller *, void *, u8, u8); static u8 i2c_ctrl_write (struct controller *, void __iomem *, u8, u8);
static u8 hpc_writecmdtoindex (u8, u8); static u8 hpc_writecmdtoindex (u8, u8);
static u8 hpc_readcmdtoindex (u8, u8); static u8 hpc_readcmdtoindex (u8, u8);
static void get_hpc_access (void); static void get_hpc_access (void);
...@@ -118,7 +118,7 @@ static void poll_hpc (void); ...@@ -118,7 +118,7 @@ static void poll_hpc (void);
static int process_changeinstatus (struct slot *, struct slot *); static int process_changeinstatus (struct slot *, struct slot *);
static int process_changeinlatch (u8, u8, struct controller *); static int process_changeinlatch (u8, u8, struct controller *);
static int hpc_poll_thread (void *); static int hpc_poll_thread (void *);
static int hpc_wait_ctlr_notworking (int, struct controller *, void *, u8 *); static int hpc_wait_ctlr_notworking (int, struct controller *, void __iomem *, u8 *);
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
...@@ -147,11 +147,11 @@ void __init ibmphp_hpc_initvars (void) ...@@ -147,11 +147,11 @@ void __init ibmphp_hpc_initvars (void)
* Action: read from HPC over I2C * Action: read from HPC over I2C
* *
*---------------------------------------------------------------------*/ *---------------------------------------------------------------------*/
static u8 i2c_ctrl_read (struct controller *ctlr_ptr, void *WPGBbar, u8 index) static u8 i2c_ctrl_read (struct controller *ctlr_ptr, void __iomem *WPGBbar, u8 index)
{ {
u8 status; u8 status;
int i; int i;
void *wpg_addr; // base addr + offset void __iomem *wpg_addr; // base addr + offset
unsigned long wpg_data; // data to/from WPG LOHI format unsigned long wpg_data; // data to/from WPG LOHI format
unsigned long ultemp; unsigned long ultemp;
unsigned long data; // actual data HILO format unsigned long data; // actual data HILO format
...@@ -255,10 +255,10 @@ static u8 i2c_ctrl_read (struct controller *ctlr_ptr, void *WPGBbar, u8 index) ...@@ -255,10 +255,10 @@ static u8 i2c_ctrl_read (struct controller *ctlr_ptr, void *WPGBbar, u8 index)
* *
* Return 0 or error codes * Return 0 or error codes
*---------------------------------------------------------------------*/ *---------------------------------------------------------------------*/
static u8 i2c_ctrl_write (struct controller *ctlr_ptr, void *WPGBbar, u8 index, u8 cmd) static u8 i2c_ctrl_write (struct controller *ctlr_ptr, void __iomem *WPGBbar, u8 index, u8 cmd)
{ {
u8 rc; u8 rc;
void *wpg_addr; // base addr + offset void __iomem *wpg_addr; // base addr + offset
unsigned long wpg_data; // data to/from WPG LOHI format unsigned long wpg_data; // data to/from WPG LOHI format
unsigned long ultemp; unsigned long ultemp;
unsigned long data; // actual data HILO format unsigned long data; // actual data HILO format
...@@ -399,7 +399,7 @@ static u8 pci_ctrl_write (struct controller *ctrl, u8 offset, u8 data) ...@@ -399,7 +399,7 @@ static u8 pci_ctrl_write (struct controller *ctrl, u8 offset, u8 data)
return rc; return rc;
} }
static u8 ctrl_read (struct controller *ctlr, void *base, u8 offset) static u8 ctrl_read (struct controller *ctlr, void __iomem *base, u8 offset)
{ {
u8 rc; u8 rc;
switch (ctlr->ctlr_type) { switch (ctlr->ctlr_type) {
...@@ -419,7 +419,7 @@ static u8 ctrl_read (struct controller *ctlr, void *base, u8 offset) ...@@ -419,7 +419,7 @@ static u8 ctrl_read (struct controller *ctlr, void *base, u8 offset)
return rc; return rc;
} }
static u8 ctrl_write (struct controller *ctlr, void *base, u8 offset, u8 data) static u8 ctrl_write (struct controller *ctlr, void __iomem *base, u8 offset, u8 data)
{ {
u8 rc = 0; u8 rc = 0;
switch (ctlr->ctlr_type) { switch (ctlr->ctlr_type) {
...@@ -536,7 +536,7 @@ static u8 hpc_readcmdtoindex (u8 cmd, u8 index) ...@@ -536,7 +536,7 @@ static u8 hpc_readcmdtoindex (u8 cmd, u8 index)
*---------------------------------------------------------------------*/ *---------------------------------------------------------------------*/
int ibmphp_hpc_readslot (struct slot * pslot, u8 cmd, u8 * pstatus) int ibmphp_hpc_readslot (struct slot * pslot, u8 cmd, u8 * pstatus)
{ {
void *wpg_bbar = NULL; void __iomem *wpg_bbar = NULL;
struct controller *ctlr_ptr; struct controller *ctlr_ptr;
struct list_head *pslotlist; struct list_head *pslotlist;
u8 index, status; u8 index, status;
...@@ -675,7 +675,7 @@ int ibmphp_hpc_readslot (struct slot * pslot, u8 cmd, u8 * pstatus) ...@@ -675,7 +675,7 @@ int ibmphp_hpc_readslot (struct slot * pslot, u8 cmd, u8 * pstatus)
*---------------------------------------------------------------------*/ *---------------------------------------------------------------------*/
int ibmphp_hpc_writeslot (struct slot * pslot, u8 cmd) int ibmphp_hpc_writeslot (struct slot * pslot, u8 cmd)
{ {
void *wpg_bbar = NULL; void __iomem *wpg_bbar = NULL;
struct controller *ctlr_ptr; struct controller *ctlr_ptr;
u8 index, status; u8 index, status;
int busindex; int busindex;
...@@ -1130,7 +1130,7 @@ void __exit ibmphp_hpc_stop_poll_thread (void) ...@@ -1130,7 +1130,7 @@ void __exit ibmphp_hpc_stop_poll_thread (void)
* Return 0, HPC_ERROR * Return 0, HPC_ERROR
* Value: * Value:
*---------------------------------------------------------------------*/ *---------------------------------------------------------------------*/
static int hpc_wait_ctlr_notworking (int timeout, struct controller *ctlr_ptr, void *wpg_bbar, static int hpc_wait_ctlr_notworking (int timeout, struct controller *ctlr_ptr, void __iomem *wpg_bbar,
u8 * pstatus) u8 * pstatus)
{ {
int rc = 0; int rc = 0;
......
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