Merge remote-tracking branch 'mkp-scsi/4.5/scsi-fixes' into fixes

[cascardo/linux.git] / drivers / pci / hotplug / cpqphp_nvram.c

diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
index 1e08ff8..c25fc90 100644 (file)
--- a/drivers/pci/hotplug/cpqphp_nvram.c
+++ b/drivers/pci/hotplug/cpqphp_nvram.c
@@ -114,10 +114,10 @@ static u32 add_byte(u32 **p_buffer, u8 value, u32 *used, u32 *avail)
        if ((*used + 1) > *avail)
                return(1);
 
-       *((u8*)*p_buffer) = value;
-       tByte = (u8**)p_buffer;
+       *((u8 *)*p_buffer) = value;
+       tByte = (u8 **)p_buffer;
        (*tByte)++;
-       *used+=1;
+       *used += 1;
        return(0);
 }
 
@@ -129,7 +129,7 @@ static u32 add_dword(u32 **p_buffer, u32 value, u32 *used, u32 *avail)
 
        **p_buffer = value;
        (*p_buffer)++;
-       *used+=4;
+       *used += 4;
        return(0);
 }
 
@@ -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
  */
-static int check_for_compaq_ROM (void __iomem *rom_start)
+static int check_for_compaq_ROM(void __iomem *rom_start)
 {
        u8 temp1, temp2, temp3, temp4, temp5, temp6;
        int result = 0;
@@ -160,12 +160,12 @@ static int check_for_compaq_ROM (void __iomem *rom_start)
            (temp6 == 'Q')) {
                result = 1;
        }
-       dbg ("%s - returned %d\n", __func__, result);
+       dbg("%s - returned %d\n", __func__, result);
        return result;
 }
 
 
-static u32 access_EV (u16 operation, u8 *ev_name, u8 *buffer, u32 *buf_size)
+static u32 access_EV(u16 operation, u8 *ev_name, u8 *buffer, u32 *buf_size)
 {
        unsigned long flags;
        int op = operation;
@@ -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
  */
-static int load_HRT (void __iomem *rom_start)
+static int load_HRT(void __iomem *rom_start)
 {
        u32 available;
        u32 temp_dword;
@@ -232,7 +232,7 @@ static int load_HRT (void __iomem *rom_start)
  *
  * Save the hot plug Resource Table in NVRAM
  */
-static u32 store_HRT (void __iomem *rom_start)
+static u32 store_HRT(void __iomem *rom_start)
 {
        u32 *buffer;
        u32 *pFill;
@@ -252,7 +252,7 @@ static u32 store_HRT (void __iomem *rom_start)
        if (!check_for_compaq_ROM(rom_start))
                return(1);
 
-       buffer = (u32*) evbuffer;
+       buffer = (u32 *) evbuffer;
 
        if (!buffer)
                return(1);
@@ -306,7 +306,7 @@ static u32 store_HRT (void __iomem *rom_start)
                loop = 0;
 
                while (resNode) {
-                       loop ++;
+                       loop++;
 
                        /* base */
                        rc = add_dword(&pFill, resNode->base, &usedbytes, &available);
@@ -331,7 +331,7 @@ static u32 store_HRT (void __iomem *rom_start)
                loop = 0;
 
                while (resNode) {
-                       loop ++;
+                       loop++;
 
                        /* base */
                        rc = add_dword(&pFill, resNode->base, &usedbytes, &available);
@@ -356,7 +356,7 @@ static u32 store_HRT (void __iomem *rom_start)
                loop = 0;
 
                while (resNode) {
-                       loop ++;
+                       loop++;
 
                        /* base */
                        rc = add_dword(&pFill, resNode->base, &usedbytes, &available);
@@ -381,7 +381,7 @@ static u32 store_HRT (void __iomem *rom_start)
                loop = 0;
 
                while (resNode) {
-                       loop ++;
+                       loop++;
 
                        /* base */
                        rc = add_dword(&pFill, resNode->base, &usedbytes, &available);
@@ -408,7 +408,7 @@ static u32 store_HRT (void __iomem *rom_start)
 
        temp_dword = usedbytes;
 
-       rc = access_EV(WRITE_EV, "CQTHPS", (u8*) buffer, &temp_dword);
+       rc = access_EV(WRITE_EV, "CQTHPS", (u8 *) buffer, &temp_dword);
 
        dbg("usedbytes = 0x%x, length = 0x%x\n", usedbytes, temp_dword);
 
@@ -423,7 +423,7 @@ static u32 store_HRT (void __iomem *rom_start)
 }
 
 
-void compaq_nvram_init (void __iomem *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);
@@ -435,7 +435,7 @@ void compaq_nvram_init (void __iomem *rom_start)
 }
 
 
-int compaq_nvram_load (void __iomem *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;
@@ -451,7 +451,7 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
        if (!evbuffer_init) {
                /* Read the resource list information in from NVRAM */
                if (load_HRT(rom_start))
-                       memset (evbuffer, 0, 1024);
+                       memset(evbuffer, 0, 1024);
 
                evbuffer_init = 1;
        }
@@ -472,7 +472,7 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
 
                p_byte += 3;
 
-               if (p_byte > ((u8*)p_EV_header + evbuffer_length))
+               if (p_byte > ((u8 *)p_EV_header + evbuffer_length))
                        return 2;
 
                bus = p_ev_ctrl->bus;
@@ -489,20 +489,20 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
 
                        p_byte += 4;
 
-                       if (p_byte > ((u8*)p_EV_header + evbuffer_length))
+                       if (p_byte > ((u8 *)p_EV_header + evbuffer_length))
                                return 2;
 
                        /* Skip forward to the next entry */
                        p_byte += (nummem + numpmem + numio + numbus) * 8;
 
-                       if (p_byte > ((u8*)p_EV_header + evbuffer_length))
+                       if (p_byte > ((u8 *)p_EV_header + evbuffer_length))
                                return 2;
 
                        p_ev_ctrl = (struct ev_hrt_ctrl *) p_byte;
 
                        p_byte += 3;
 
-                       if (p_byte > ((u8*)p_EV_header + evbuffer_length))
+                       if (p_byte > ((u8 *)p_EV_header + evbuffer_length))
                                return 2;
 
                        bus = p_ev_ctrl->bus;
@@ -517,7 +517,7 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
 
                p_byte += 4;
 
-               if (p_byte > ((u8*)p_EV_header + evbuffer_length))
+               if (p_byte > ((u8 *)p_EV_header + evbuffer_length))
                        return 2;
 
                while (nummem--) {
@@ -526,20 +526,20 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
                        if (!mem_node)
                                break;
 
-                       mem_node->base = *(u32*)p_byte;
-                       dbg("mem base = %8.8x\n",mem_node->base);
+                       mem_node->base = *(u32 *)p_byte;
+                       dbg("mem base = %8.8x\n", mem_node->base);
                        p_byte += 4;
 
-                       if (p_byte > ((u8*)p_EV_header + evbuffer_length)) {
+                       if (p_byte > ((u8 *)p_EV_header + evbuffer_length)) {
                                kfree(mem_node);
                                return 2;
                        }
 
-                       mem_node->length = *(u32*)p_byte;
-                       dbg("mem length = %8.8x\n",mem_node->length);
+                       mem_node->length = *(u32 *)p_byte;
+                       dbg("mem length = %8.8x\n", mem_node->length);
                        p_byte += 4;
 
-                       if (p_byte > ((u8*)p_EV_header + evbuffer_length)) {
+                       if (p_byte > ((u8 *)p_EV_header + evbuffer_length)) {
                                kfree(mem_node);
                                return 2;
                        }
@@ -554,20 +554,20 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
                        if (!p_mem_node)
                                break;
 
-                       p_mem_node->base = *(u32*)p_byte;
-                       dbg("pre-mem base = %8.8x\n",p_mem_node->base);
+                       p_mem_node->base = *(u32 *)p_byte;
+                       dbg("pre-mem base = %8.8x\n", p_mem_node->base);
                        p_byte += 4;
 
-                       if (p_byte > ((u8*)p_EV_header + evbuffer_length)) {
+                       if (p_byte > ((u8 *)p_EV_header + evbuffer_length)) {
                                kfree(p_mem_node);
                                return 2;
                        }
 
-                       p_mem_node->length = *(u32*)p_byte;
-                       dbg("pre-mem length = %8.8x\n",p_mem_node->length);
+                       p_mem_node->length = *(u32 *)p_byte;
+                       dbg("pre-mem length = %8.8x\n", p_mem_node->length);
                        p_byte += 4;
 
-                       if (p_byte > ((u8*)p_EV_header + evbuffer_length)) {
+                       if (p_byte > ((u8 *)p_EV_header + evbuffer_length)) {
                                kfree(p_mem_node);
                                return 2;
                        }
@@ -582,20 +582,20 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
                        if (!io_node)
                                break;
 
-                       io_node->base = *(u32*)p_byte;
-                       dbg("io base = %8.8x\n",io_node->base);
+                       io_node->base = *(u32 *)p_byte;
+                       dbg("io base = %8.8x\n", io_node->base);
                        p_byte += 4;
 
-                       if (p_byte > ((u8*)p_EV_header + evbuffer_length)) {
+                       if (p_byte > ((u8 *)p_EV_header + evbuffer_length)) {
                                kfree(io_node);
                                return 2;
                        }
 
-                       io_node->length = *(u32*)p_byte;
-                       dbg("io length = %8.8x\n",io_node->length);
+                       io_node->length = *(u32 *)p_byte;
+                       dbg("io length = %8.8x\n", io_node->length);
                        p_byte += 4;
 
-                       if (p_byte > ((u8*)p_EV_header + evbuffer_length)) {
+                       if (p_byte > ((u8 *)p_EV_header + evbuffer_length)) {
                                kfree(io_node);
                                return 2;
                        }
@@ -610,18 +610,18 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
                        if (!bus_node)
                                break;
 
-                       bus_node->base = *(u32*)p_byte;
+                       bus_node->base = *(u32 *)p_byte;
                        p_byte += 4;
 
-                       if (p_byte > ((u8*)p_EV_header + evbuffer_length)) {
+                       if (p_byte > ((u8 *)p_EV_header + evbuffer_length)) {
                                kfree(bus_node);
                                return 2;
                        }
 
-                       bus_node->length = *(u32*)p_byte;
+                       bus_node->length = *(u32 *)p_byte;
                        p_byte += 4;
 
-                       if (p_byte > ((u8*)p_EV_header + evbuffer_length)) {
+                       if (p_byte > ((u8 *)p_EV_header + evbuffer_length)) {
                                kfree(bus_node);
                                return 2;
                        }
@@ -650,7 +650,7 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
 }
 
 
-int compaq_nvram_store (void __iomem *rom_start)
+int compaq_nvram_store(void __iomem *rom_start)
 {
        int rc = 1;