git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
drivers
/
pci
/
hotplug
/
cpqphp_nvram.c
diff --git
a/drivers/pci/hotplug/cpqphp_nvram.c
b/drivers/pci/hotplug/cpqphp_nvram.c
index
8cf4bd3
..
ae5e974
100644
(file)
--- a/
drivers/pci/hotplug/cpqphp_nvram.c
+++ b/
drivers/pci/hotplug/cpqphp_nvram.c
@@
-26,7
+26,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/types.h>
@@
-34,6
+33,7
@@
#include <linux/slab.h>
#include <linux/workqueue.h>
#include <linux/pci.h>
#include <linux/slab.h>
#include <linux/workqueue.h>
#include <linux/pci.h>
+#include <linux/pci_hotplug.h>
#include <linux/init.h>
#include <asm/uaccess.h>
#include "cpqphp.h"
#include <linux/init.h>
#include <asm/uaccess.h>
#include "cpqphp.h"
@@
-92,7
+92,7
@@
static u8 evbuffer_init;
static u8 evbuffer_length;
static u8 evbuffer[1024];
static u8 evbuffer_length;
static u8 evbuffer[1024];
-static void *compaq_int15_entry_point;
+static void
__iomem
*compaq_int15_entry_point;
static spinlock_t int15_lock; /* lock for ordering int15_bios_call() */
static spinlock_t int15_lock; /* lock for ordering int15_bios_call() */
@@
-141,7
+141,7
@@
static u32 add_dword( u32 **p_buffer, u32 value, u32 *used, u32 *avail)
*
* returns 0 for non-Compaq ROM, 1 for Compaq ROM
*/
*
* returns 0 for non-Compaq ROM, 1 for Compaq ROM
*/
-static int check_for_compaq_ROM (void *rom_start)
+static int check_for_compaq_ROM (void
__iomem
*rom_start)
{
u8 temp1, temp2, temp3, temp4, temp5, temp6;
int result = 0;
{
u8 temp1, temp2, temp3, temp4, temp5, temp6;
int result = 0;
@@
-197,7
+197,7
@@
static u32 access_EV (u16 operation, u8 *ev_name, u8 *buffer, u32 *buf_size)
*
* Read the hot plug Resource Table from NVRAM
*/
*
* Read the hot plug Resource Table from NVRAM
*/
-static int load_HRT (void *rom_start)
+static int load_HRT (void
__iomem
*rom_start)
{
u32 available;
u32 temp_dword;
{
u32 available;
u32 temp_dword;
@@
-231,7
+231,7
@@
static int load_HRT (void *rom_start)
*
* Save the hot plug Resource Table in NVRAM
*/
*
* Save the hot plug Resource Table in NVRAM
*/
-static u32 store_HRT (void *rom_start)
+static u32 store_HRT (void
__iomem
*rom_start)
{
u32 *buffer;
u32 *pFill;
{
u32 *buffer;
u32 *pFill;
@@
-423,7
+423,7
@@
static u32 store_HRT (void *rom_start)
}
}
-void compaq_nvram_init (void *rom_start)
+void compaq_nvram_init (void
__iomem
*rom_start)
{
if (rom_start) {
compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
{
if (rom_start) {
compaq_int15_entry_point = (rom_start + ROM_INT15_PHY_ADDR - ROM_PHY_ADDR);
@@
-435,7
+435,7
@@
void compaq_nvram_init (void *rom_start)
}
}
-int compaq_nvram_load (void *rom_start, struct controller *ctrl)
+int compaq_nvram_load (void
__iomem
*rom_start, struct controller *ctrl)
{
u8 bus, device, function;
u8 nummem, numpmem, numio, numbus;
{
u8 bus, device, function;
u8 nummem, numpmem, numio, numbus;
@@
-520,7
+520,7
@@
int compaq_nvram_load (void *rom_start, struct controller *ctrl)
return 2;
while (nummem--) {
return 2;
while (nummem--) {
- mem_node =
(struct pci_resource*)
kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
+ mem_node = kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
if (!mem_node)
break;
if (!mem_node)
break;
@@
-548,7
+548,7
@@
int compaq_nvram_load (void *rom_start, struct controller *ctrl)
}
while (numpmem--) {
}
while (numpmem--) {
- p_mem_node =
(struct pci_resource*)
kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
+ p_mem_node = kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
if (!p_mem_node)
break;
if (!p_mem_node)
break;
@@
-576,7
+576,7
@@
int compaq_nvram_load (void *rom_start, struct controller *ctrl)
}
while (numio--) {
}
while (numio--) {
- io_node =
(struct pci_resource*)
kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
+ io_node = kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
if (!io_node)
break;
if (!io_node)
break;
@@
-604,7
+604,7
@@
int compaq_nvram_load (void *rom_start, struct controller *ctrl)
}
while (numbus--) {
}
while (numbus--) {
- bus_node =
(struct pci_resource*)
kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
+ bus_node = kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
if (!bus_node)
break;
if (!bus_node)
break;
@@
-648,7
+648,7
@@
int compaq_nvram_load (void *rom_start, struct controller *ctrl)
}
}
-int compaq_nvram_store (void *rom_start)
+int compaq_nvram_store (void
__iomem
*rom_start)
{
int rc = 1;
{
int rc = 1;