aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/hotplug/cpqphp_nvram.c
diff options
context:
space:
mode:
authorAlex Chiang <achiang@hp.com>2009-03-31 11:23:11 -0400
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-06-11 15:04:07 -0400
commit861fefbf550d41e7a4f44584f3ec35977fa08bf1 (patch)
treee7fd059f852d225f5270bd5ef0a367eab06a6a8f /drivers/pci/hotplug/cpqphp_nvram.c
parentd09ee9687e027fc7d2c6b95daf05a8ef3ff06340 (diff)
PCI Hotplug: cpqphp: stray whitespace cleanups
Clean up all stray whitespace issues, such as trailing whitespace, spaces before tabs, etc. and whatever else vim's c_space_errors highlights in red. Signed-off-by: Alex Chiang <achiang@hp.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci/hotplug/cpqphp_nvram.c')
-rw-r--r--drivers/pci/hotplug/cpqphp_nvram.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
index cb174888002b..76e110f0e3a6 100644
--- a/drivers/pci/hotplug/cpqphp_nvram.c
+++ b/drivers/pci/hotplug/cpqphp_nvram.c
@@ -113,7 +113,7 @@ static u32 add_byte( u32 **p_buffer, u8 value, u32 *used, u32 *avail)
113 113
114 if ((*used + 1) > *avail) 114 if ((*used + 1) > *avail)
115 return(1); 115 return(1);
116 116
117 *((u8*)*p_buffer) = value; 117 *((u8*)*p_buffer) = value;
118 tByte = (u8**)p_buffer; 118 tByte = (u8**)p_buffer;
119 (*tByte)++; 119 (*tByte)++;
@@ -170,10 +170,10 @@ static u32 access_EV (u16 operation, u8 *ev_name, u8 *buffer, u32 *buf_size)
170 unsigned long flags; 170 unsigned long flags;
171 int op = operation; 171 int op = operation;
172 int ret_val; 172 int ret_val;
173 173
174 if (!compaq_int15_entry_point) 174 if (!compaq_int15_entry_point)
175 return -ENODEV; 175 return -ENODEV;
176 176
177 spin_lock_irqsave(&int15_lock, flags); 177 spin_lock_irqsave(&int15_lock, flags);
178 __asm__ ( 178 __asm__ (
179 "xorl %%ebx,%%ebx\n" \ 179 "xorl %%ebx,%%ebx\n" \
@@ -187,7 +187,7 @@ static u32 access_EV (u16 operation, u8 *ev_name, u8 *buffer, u32 *buf_size)
187 "D" (buffer), "m" (compaq_int15_entry_point) 187 "D" (buffer), "m" (compaq_int15_entry_point)
188 : "%ebx", "%edx"); 188 : "%ebx", "%edx");
189 spin_unlock_irqrestore(&int15_lock, flags); 189 spin_unlock_irqrestore(&int15_lock, flags);
190 190
191 return((ret_val & 0xFF00) >> 8); 191 return((ret_val & 0xFF00) >> 8);
192} 192}
193 193
@@ -263,7 +263,7 @@ static u32 store_HRT (void __iomem *rom_start)
263 p_EV_header = (struct ev_hrt_header *) pFill; 263 p_EV_header = (struct ev_hrt_header *) pFill;
264 264
265 ctrl = cpqhp_ctrl_list; 265 ctrl = cpqhp_ctrl_list;
266 266
267 // The revision of this structure 267 // The revision of this structure
268 rc = add_byte( &pFill, 1 + ctrl->push_flag, &usedbytes, &available); 268 rc = add_byte( &pFill, 1 + ctrl->push_flag, &usedbytes, &available);
269 if (rc) 269 if (rc)
@@ -401,7 +401,7 @@ static u32 store_HRT (void __iomem *rom_start)
401 401
402 ctrl = ctrl->next; 402 ctrl = ctrl->next;
403 } 403 }
404 404
405 p_EV_header->num_of_ctrl = numCtrl; 405 p_EV_header->num_of_ctrl = numCtrl;
406 406
407 // Now store the EV 407 // Now store the EV
@@ -479,7 +479,7 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
479 function = p_ev_ctrl->function; 479 function = p_ev_ctrl->function;
480 480
481 while ((bus != ctrl->bus) || 481 while ((bus != ctrl->bus) ||
482 (device != PCI_SLOT(ctrl->pci_dev->devfn)) || 482 (device != PCI_SLOT(ctrl->pci_dev->devfn)) ||
483 (function != PCI_FUNC(ctrl->pci_dev->devfn))) { 483 (function != PCI_FUNC(ctrl->pci_dev->devfn))) {
484 nummem = p_ev_ctrl->mem_avail; 484 nummem = p_ev_ctrl->mem_avail;
485 numpmem = p_ev_ctrl->p_mem_avail; 485 numpmem = p_ev_ctrl->p_mem_avail;
@@ -640,14 +640,14 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
640 if (rc) 640 if (rc)
641 return(rc); 641 return(rc);
642 } else { 642 } else {
643 if ((evbuffer[0] != 0) && (!ctrl->push_flag)) 643 if ((evbuffer[0] != 0) && (!ctrl->push_flag))
644 return 1; 644 return 1;
645 } 645 }
646 646
647 return 0; 647 return 0;
648} 648}
649 649
650 650
651int compaq_nvram_store (void __iomem *rom_start) 651int compaq_nvram_store (void __iomem *rom_start)
652{ 652{
653 int rc = 1; 653 int rc = 1;