Merge branches 'for-3.17/upstream', 'for-3.17/cp2112', 'for-3.17/huion', 'for-3.17...

[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 9600a39..0968a9b 100644 (file)
--- a/drivers/pci/hotplug/cpqphp_nvram.c
+++ b/drivers/pci/hotplug/cpqphp_nvram.c
@@ -107,7 +107,7 @@ static spinlock_t int15_lock;
  */
 
 
-static u32 add_byte( u32 **p_buffer, u8 value, u32 *used, u32 *avail)
+static u32 add_byte(u32 **p_buffer, u8 value, u32 *used, u32 *avail)
 {
        u8 **tByte;
 
@@ -122,7 +122,7 @@ static u32 add_byte( u32 **p_buffer, u8 value, u32 *used, u32 *avail)
 }
 
 
-static u32 add_dword( u32 **p_buffer, u32 value, u32 *used, u32 *avail)
+static u32 add_dword(u32 **p_buffer, u32 value, u32 *used, u32 *avail)
 {
        if ((*used + 4) > *avail)
                return(1);
@@ -267,12 +267,12 @@ static u32 store_HRT (void __iomem *rom_start)
        ctrl = cpqhp_ctrl_list;
 
        /* The revision of this structure */
-       rc = add_byte( &pFill, 1 + ctrl->push_flag, &usedbytes, &available);
+       rc = add_byte(&pFill, 1 + ctrl->push_flag, &usedbytes, &available);
        if (rc)
                return(rc);
 
        /* The number of controllers */
-       rc = add_byte( &pFill, 1, &usedbytes, &available);
+       rc = add_byte(&pFill, 1, &usedbytes, &available);
        if (rc)
                return(rc);
 
@@ -282,22 +282,22 @@ static u32 store_HRT (void __iomem *rom_start)
                numCtrl++;
 
                /* The bus number */
-               rc = add_byte( &pFill, ctrl->bus, &usedbytes, &available);
+               rc = add_byte(&pFill, ctrl->bus, &usedbytes, &available);
                if (rc)
                        return(rc);
 
                /* The device Number */
-               rc = add_byte( &pFill, PCI_SLOT(ctrl->pci_dev->devfn), &usedbytes, &available);
+               rc = add_byte(&pFill, PCI_SLOT(ctrl->pci_dev->devfn), &usedbytes, &available);
                if (rc)
                        return(rc);
 
                /* The function Number */
-               rc = add_byte( &pFill, PCI_FUNC(ctrl->pci_dev->devfn), &usedbytes, &available);
+               rc = add_byte(&pFill, PCI_FUNC(ctrl->pci_dev->devfn), &usedbytes, &available);
                if (rc)
                        return(rc);
 
                /* Skip the number of available entries */
-               rc = add_dword( &pFill, 0, &usedbytes, &available);
+               rc = add_dword(&pFill, 0, &usedbytes, &available);
                if (rc)
                        return(rc);
 
@@ -311,12 +311,12 @@ static u32 store_HRT (void __iomem *rom_start)
                        loop ++;
 
                        /* base */
-                       rc = add_dword( &pFill, resNode->base, &usedbytes, &available);
+                       rc = add_dword(&pFill, resNode->base, &usedbytes, &available);
                        if (rc)
                                return(rc);
 
                        /* length */
-                       rc = add_dword( &pFill, resNode->length, &usedbytes, &available);
+                       rc = add_dword(&pFill, resNode->length, &usedbytes, &available);
                        if (rc)
                                return(rc);
 
@@ -336,12 +336,12 @@ static u32 store_HRT (void __iomem *rom_start)
                        loop ++;
 
                        /* base */
-                       rc = add_dword( &pFill, resNode->base, &usedbytes, &available);
+                       rc = add_dword(&pFill, resNode->base, &usedbytes, &available);
                        if (rc)
                                return(rc);
 
                        /* length */
-                       rc = add_dword( &pFill, resNode->length, &usedbytes, &available);
+                       rc = add_dword(&pFill, resNode->length, &usedbytes, &available);
                        if (rc)
                                return(rc);
 
@@ -361,12 +361,12 @@ static u32 store_HRT (void __iomem *rom_start)
                        loop ++;
 
                        /* base */
-                       rc = add_dword( &pFill, resNode->base, &usedbytes, &available);
+                       rc = add_dword(&pFill, resNode->base, &usedbytes, &available);
                        if (rc)
                                return(rc);
 
                        /* length */
-                       rc = add_dword( &pFill, resNode->length, &usedbytes, &available);
+                       rc = add_dword(&pFill, resNode->length, &usedbytes, &available);
                        if (rc)
                                return(rc);
 
@@ -386,12 +386,12 @@ static u32 store_HRT (void __iomem *rom_start)
                        loop ++;
 
                        /* base */
-                       rc = add_dword( &pFill, resNode->base, &usedbytes, &available);
+                       rc = add_dword(&pFill, resNode->base, &usedbytes, &available);
                        if (rc)
                                return(rc);
 
                        /* length */
-                       rc = add_dword( &pFill, resNode->length, &usedbytes, &available);
+                       rc = add_dword(&pFill, resNode->length, &usedbytes, &available);
                        if (rc)
                                return(rc);