Commit 34962ea9 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman

[PATCH] PCI Hotplug: fix the rest of the drivers for __iomem and other sparse issues.

Signed-off-by: default avatarGreg Kroah-Hartman <greg@kroah.com>
parent d2531433
...@@ -69,11 +69,11 @@ static struct pci_bus *bus0; ...@@ -69,11 +69,11 @@ static struct pci_bus *bus0;
static struct pci_dev *hc_dev; static struct pci_dev *hc_dev;
/* Host controller register addresses */ /* Host controller register addresses */
static void *hc_registers; static void __iomem *hc_registers;
static void *csr_hc_index; static void __iomem *csr_hc_index;
static void *csr_hc_data; static void __iomem *csr_hc_data;
static void *csr_int_status; static void __iomem *csr_int_status;
static void *csr_int_mask; static void __iomem *csr_int_mask;
static int zt5550_hc_config(struct pci_dev *pdev) static int zt5550_hc_config(struct pci_dev *pdev)
......
...@@ -311,7 +311,7 @@ struct php_ctlr_state_s { ...@@ -311,7 +311,7 @@ struct php_ctlr_state_s {
php_intr_callback_t presence_change_callback; php_intr_callback_t presence_change_callback;
php_intr_callback_t power_fault_callback; php_intr_callback_t power_fault_callback;
void *callback_instance_id; void *callback_instance_id;
void *creg; /* Ptr to controller register space */ void __iomem *creg; /* Ptr to controller register space */
}; };
/* Inline functions */ /* Inline functions */
......
...@@ -1661,7 +1661,7 @@ int shpchp_event_start_thread (void) ...@@ -1661,7 +1661,7 @@ int shpchp_event_start_thread (void)
event_finished=0; event_finished=0;
init_MUTEX_LOCKED(&event_semaphore); init_MUTEX_LOCKED(&event_semaphore);
pid = kernel_thread(event_thread, 0, 0); pid = kernel_thread(event_thread, NULL, 0);
if (pid < 0) { if (pid < 0) {
err ("Can't start up our event thread\n"); err ("Can't start up our event thread\n");
......
...@@ -1492,8 +1492,7 @@ int shpc_init(struct controller * ctrl, ...@@ -1492,8 +1492,7 @@ int shpc_init(struct controller * ctrl,
goto abort_free_ctlr; goto abort_free_ctlr;
} }
php_ctlr->creg = (struct ctrl_reg *) php_ctlr->creg = ioremap(pci_resource_start(pdev, 0) + shpc_base_offset, pci_resource_len(pdev, 0));
ioremap(pci_resource_start(pdev, 0) + shpc_base_offset, pci_resource_len(pdev, 0));
if (!php_ctlr->creg) { if (!php_ctlr->creg) {
err("%s: cannot remap MMIO region %lx @ %lx\n", __FUNCTION__, pci_resource_len(pdev, 0), err("%s: cannot remap MMIO region %lx @ %lx\n", __FUNCTION__, pci_resource_len(pdev, 0),
pci_resource_start(pdev, 0) + shpc_base_offset); pci_resource_start(pdev, 0) + shpc_base_offset);
......
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