aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci/hotplug/ibmphp_hpc.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2013-11-14 13:28:18 -0500
committerBjorn Helgaas <bhelgaas@google.com>2013-11-14 13:28:18 -0500
commitf7625980f5820edd1a73536e1a03bcbc1f889fec (patch)
tree145e76f39b3e1d08d3e7a48a0993c0cd59088cc6 /drivers/pci/hotplug/ibmphp_hpc.c
parent4fbf888accb39af423f271111d44e8186f053723 (diff)
PCI: Fix whitespace, capitalization, and spelling errors
Fix whitespace, capitalization, and spelling errors. No functional change. I know "busses" is not an error, but "buses" was more common, so I used it consistently. Signed-off-by: Marta Rybczynska <rybczynska@gmail.com> (pci_reset_bridge_secondary_bus()) Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/pci/hotplug/ibmphp_hpc.c')
-rw-r--r--drivers/pci/hotplug/ibmphp_hpc.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/drivers/pci/hotplug/ibmphp_hpc.c b/drivers/pci/hotplug/ibmphp_hpc.c
index f59ed30512b5..5fc7a089f532 100644
--- a/drivers/pci/hotplug/ibmphp_hpc.c
+++ b/drivers/pci/hotplug/ibmphp_hpc.c
@@ -258,7 +258,7 @@ static u8 i2c_ctrl_write (struct controller *ctlr_ptr, void __iomem *WPGBbar, u8
258{ 258{
259 u8 rc; 259 u8 rc;
260 void __iomem *wpg_addr; // base addr + offset 260 void __iomem *wpg_addr; // base addr + offset
261 unsigned long wpg_data; // data to/from WPG LOHI format 261 unsigned long wpg_data; // data to/from WPG LOHI format
262 unsigned long ultemp; 262 unsigned long ultemp;
263 unsigned long data; // actual data HILO format 263 unsigned long data; // actual data HILO format
264 int i; 264 int i;
@@ -351,7 +351,7 @@ static u8 i2c_ctrl_write (struct controller *ctlr_ptr, void __iomem *WPGBbar, u8
351} 351}
352 352
353//------------------------------------------------------------ 353//------------------------------------------------------------
354// Read from ISA type HPC 354// Read from ISA type HPC
355//------------------------------------------------------------ 355//------------------------------------------------------------
356static u8 isa_ctrl_read (struct controller *ctlr_ptr, u8 offset) 356static u8 isa_ctrl_read (struct controller *ctlr_ptr, u8 offset)
357{ 357{
@@ -372,7 +372,7 @@ static void isa_ctrl_write (struct controller *ctlr_ptr, u8 offset, u8 data)
372{ 372{
373 u16 start_address; 373 u16 start_address;
374 u16 port_address; 374 u16 port_address;
375 375
376 start_address = ctlr_ptr->u.isa_ctlr.io_start; 376 start_address = ctlr_ptr->u.isa_ctlr.io_start;
377 port_address = start_address + (u16) offset; 377 port_address = start_address + (u16) offset;
378 outb (data, port_address); 378 outb (data, port_address);
@@ -656,11 +656,11 @@ int ibmphp_hpc_readslot (struct slot * pslot, u8 cmd, u8 * pstatus)
656 //-------------------------------------------------------------------- 656 //--------------------------------------------------------------------
657 // cleanup 657 // cleanup
658 //-------------------------------------------------------------------- 658 //--------------------------------------------------------------------
659 659
660 // remove physical to logical address mapping 660 // remove physical to logical address mapping
661 if ((ctlr_ptr->ctlr_type == 2) || (ctlr_ptr->ctlr_type == 4)) 661 if ((ctlr_ptr->ctlr_type == 2) || (ctlr_ptr->ctlr_type == 4))
662 iounmap (wpg_bbar); 662 iounmap (wpg_bbar);
663 663
664 free_hpc_access (); 664 free_hpc_access ();
665 665
666 debug_polling ("%s - Exit rc[%d]\n", __func__, rc); 666 debug_polling ("%s - Exit rc[%d]\n", __func__, rc);
@@ -835,7 +835,7 @@ static int poll_hpc(void *data)
835 down (&semOperations); 835 down (&semOperations);
836 836
837 switch (poll_state) { 837 switch (poll_state) {
838 case POLL_LATCH_REGISTER: 838 case POLL_LATCH_REGISTER:
839 oldlatchlow = curlatchlow; 839 oldlatchlow = curlatchlow;
840 ctrl_count = 0x00; 840 ctrl_count = 0x00;
841 list_for_each (pslotlist, &ibmphp_slot_head) { 841 list_for_each (pslotlist, &ibmphp_slot_head) {
@@ -892,16 +892,16 @@ static int poll_hpc(void *data)
892 892
893 if (kthread_should_stop()) 893 if (kthread_should_stop())
894 goto out_sleep; 894 goto out_sleep;
895 895
896 down (&semOperations); 896 down (&semOperations);
897 897
898 if (poll_count >= POLL_LATCH_CNT) { 898 if (poll_count >= POLL_LATCH_CNT) {
899 poll_count = 0; 899 poll_count = 0;
900 poll_state = POLL_SLOTS; 900 poll_state = POLL_SLOTS;
901 } else 901 } else
902 poll_state = POLL_LATCH_REGISTER; 902 poll_state = POLL_LATCH_REGISTER;
903 break; 903 break;
904 } 904 }
905 /* give up the hardware semaphore */ 905 /* give up the hardware semaphore */
906 up (&semOperations); 906 up (&semOperations);
907 /* sleep for a short time just for good measure */ 907 /* sleep for a short time just for good measure */
@@ -958,7 +958,7 @@ static int process_changeinstatus (struct slot *pslot, struct slot *poldslot)
958 // bit 5 - HPC_SLOT_PWRGD 958 // bit 5 - HPC_SLOT_PWRGD
959 if ((pslot->status & 0x20) != (poldslot->status & 0x20)) 959 if ((pslot->status & 0x20) != (poldslot->status & 0x20))
960 // OFF -> ON: ignore, ON -> OFF: disable slot 960 // OFF -> ON: ignore, ON -> OFF: disable slot
961 if ((poldslot->status & 0x20) && (SLOT_CONNECT (poldslot->status) == HPC_SLOT_CONNECTED) && (SLOT_PRESENT (poldslot->status))) 961 if ((poldslot->status & 0x20) && (SLOT_CONNECT (poldslot->status) == HPC_SLOT_CONNECTED) && (SLOT_PRESENT (poldslot->status)))
962 disable = 1; 962 disable = 1;
963 963
964 // bit 6 - HPC_SLOT_BUS_SPEED 964 // bit 6 - HPC_SLOT_BUS_SPEED
@@ -980,7 +980,7 @@ static int process_changeinstatus (struct slot *pslot, struct slot *poldslot)
980 pslot->status &= ~HPC_SLOT_POWER; 980 pslot->status &= ~HPC_SLOT_POWER;
981 } 981 }
982 } 982 }
983 // CLOSE -> OPEN 983 // CLOSE -> OPEN
984 else if ((SLOT_PWRGD (poldslot->status) == HPC_SLOT_PWRGD_GOOD) 984 else if ((SLOT_PWRGD (poldslot->status) == HPC_SLOT_PWRGD_GOOD)
985 && (SLOT_CONNECT (poldslot->status) == HPC_SLOT_CONNECTED) && (SLOT_PRESENT (poldslot->status))) { 985 && (SLOT_CONNECT (poldslot->status) == HPC_SLOT_CONNECTED) && (SLOT_PRESENT (poldslot->status))) {
986 disable = 1; 986 disable = 1;
@@ -1075,7 +1075,7 @@ void __exit ibmphp_hpc_stop_poll_thread (void)
1075 debug ("before locking operations \n"); 1075 debug ("before locking operations \n");
1076 ibmphp_lock_operations (); 1076 ibmphp_lock_operations ();
1077 debug ("after locking operations \n"); 1077 debug ("after locking operations \n");
1078 1078
1079 // wait for poll thread to exit 1079 // wait for poll thread to exit
1080 debug ("before sem_exit down \n"); 1080 debug ("before sem_exit down \n");
1081 down (&sem_exit); 1081 down (&sem_exit);