UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[PATCH] shpchp: Cleanup interrupt polling timer 

This patch cleans up the interrupt polling timer code in
shpchp_hpc.c. This has no functional changes.

Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Cc: Kristen Accardi <kristen.c.accardi@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Kenji Kaneshige 2006-05-12 11:13:02 +09:00 committed by Greg Kroah-Hartman
parent 4085399da3
commit f426395726
1 changed files with 25 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
drivers/pci/hotplug/shpchp_hpc.c
View File

@ -221,8 +221,7 @@ static spinlock_t list_lock;
static atomic_t shpchp_num_controllers = ATOMIC_INIT(0); static atomic_t shpchp_num_controllers = ATOMIC_INIT(0);
static irqreturn_t shpc_isr(int irq, void *dev_id, struct pt_regs *regs); static irqreturn_t shpc_isr(int irq, void *dev_id, struct pt_regs *regs);
static void start_int_poll_timer(struct php_ctlr_state_s *php_ctlr, int sec);
static void start_int_poll_timer(struct php_ctlr_state_s *php_ctlr, int seconds);
static int hpc_check_cmd_status(struct controller *ctrl); static int hpc_check_cmd_status(struct controller *ctrl);
static inline u8 shpc_readb(struct controller *ctrl, int reg) static inline u8 shpc_readb(struct controller *ctrl, int reg)
@ -268,47 +267,41 @@ static inline int shpc_indirect_read(struct controller *ctrl, int index,
return pci_read_config_dword(pdev, cap_offset + DWORD_DATA, value); return pci_read_config_dword(pdev, cap_offset + DWORD_DATA, value);
} }
/* This is the interrupt polling timeout function. */ /*
* This is the interrupt polling timeout function.
*/
static void int_poll_timeout(unsigned long lphp_ctlr) static void int_poll_timeout(unsigned long lphp_ctlr)
{ {
struct php_ctlr_state_s *php_ctlr = (struct php_ctlr_state_s *)lphp_ctlr; struct php_ctlr_state_s *php_ctlr =
(struct php_ctlr_state_s *)lphp_ctlr;
DBG_ENTER_ROUTINE DBG_ENTER_ROUTINE
if ( !php_ctlr ) { /* Poll for interrupt events. regs == NULL => polling */
err("%s: Invalid HPC controller handle!\n", __FUNCTION__); shpc_isr(0, php_ctlr->callback_instance_id, NULL);
return;
}
/* Poll for interrupt events. regs == NULL => polling */ init_timer(&php_ctlr->int_poll_timer);
shpc_isr(0, php_ctlr->callback_instance_id, NULL );
init_timer(&php_ctlr->int_poll_timer);
if (!shpchp_poll_time) if (!shpchp_poll_time)
shpchp_poll_time = 2; /* reset timer to poll in 2 secs if user doesn't specify at module installation*/ shpchp_poll_time = 2; /* default polling interval is 2 sec */
start_int_poll_timer(php_ctlr, shpchp_poll_time); start_int_poll_timer(php_ctlr, shpchp_poll_time);
return; DBG_LEAVE_ROUTINE
} }
/* This function starts the interrupt polling timer. */ /*
static void start_int_poll_timer(struct php_ctlr_state_s *php_ctlr, int seconds) * This function starts the interrupt polling timer.
*/
static void start_int_poll_timer(struct php_ctlr_state_s *php_ctlr, int sec)
{ {
if (!php_ctlr) { /* Clamp to sane value */
err("%s: Invalid HPC controller handle!\n", __FUNCTION__); if ((sec <= 0) || (sec > 60))
return; sec = 2;
}
if ( ( seconds <= 0 ) || ( seconds > 60 ) ) php_ctlr->int_poll_timer.function = &int_poll_timeout;
seconds = 2; /* Clamp to sane value */ php_ctlr->int_poll_timer.data = (unsigned long)php_ctlr;
php_ctlr->int_poll_timer.expires = jiffies + sec * HZ;
php_ctlr->int_poll_timer.function = &int_poll_timeout; add_timer(&php_ctlr->int_poll_timer);
php_ctlr->int_poll_timer.data = (unsigned long)php_ctlr; /* Instance data */
php_ctlr->int_poll_timer.expires = jiffies + seconds * HZ;
add_timer(&php_ctlr->int_poll_timer);
return;
} }
static inline int shpc_wait_cmd(struct controller *ctrl) static inline int shpc_wait_cmd(struct controller *ctrl)