forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[ARM] pxa/zaurus: cleanup sharpsl_pm.c

Browse source 
This fixes checkpatch/style problems in sharpsl_pm.c, allowing me to
submit real fixes next.

Signed-off-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
This commit is contained in:
Pavel Machek 2009-10-22 21:35:33 +02:00 • committed by Eric Miao
parent 61333c6300
commit b64b0b76cd
2 changed files with 59 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

50
arch/arm/mach-pxa/sharpsl_pm.c
View file

@ -165,19 +165,20 @@ struct battery_thresh spitz_battery_levels_noac[] = {
}; };
/* MAX1111 Commands */ /* MAX1111 Commands */
#define MAXCTRL_PD0 1u << 0 #define MAXCTRL_PD0 (1u << 0)
#define MAXCTRL_PD1 1u << 1 #define MAXCTRL_PD1 (1u << 1)
#define MAXCTRL_SGL 1u << 2 #define MAXCTRL_SGL (1u << 2)
#define MAXCTRL_UNI 1u << 3 #define MAXCTRL_UNI (1u << 3)
#define MAXCTRL_SEL_SH 4 #define MAXCTRL_SEL_SH 4
#define MAXCTRL_STR 1u << 7 #define MAXCTRL_STR (1u << 7)
/* /*
* Read MAX1111 ADC * Read MAX1111 ADC
*/ */
int sharpsl_pm_pxa_read_max1111(int channel) int sharpsl_pm_pxa_read_max1111(int channel)
{ {
if (machine_is_tosa()) // Ugly, better move this function into another module /* Ugly, better move this function into another module */
if (machine_is_tosa())
return 0; return 0;
#ifdef CONFIG_CORGI_SSP_DEPRECATED #ifdef CONFIG_CORGI_SSP_DEPRECATED
@ -238,7 +239,7 @@ EXPORT_SYMBOL(sharpsl_battery_kick);
static void sharpsl_battery_thread(struct work_struct *private_) static void sharpsl_battery_thread(struct work_struct *private_)
{ {
int voltage, percent, apm_status, i = 0; int voltage, percent, apm_status, i;
if (!sharpsl_pm.machinfo) if (!sharpsl_pm.machinfo)
return; return;
@ -250,15 +251,14 @@ static void sharpsl_battery_thread(struct work_struct *private_)
&& time_after(jiffies, sharpsl_pm.charge_start_time + SHARPSL_CHARGE_ON_TIME_INTERVAL)) && time_after(jiffies, sharpsl_pm.charge_start_time + SHARPSL_CHARGE_ON_TIME_INTERVAL))
schedule_delayed_work(&toggle_charger, 0); schedule_delayed_work(&toggle_charger, 0);
while(1) { for (i = 0; i < 5; i++) {
voltage = sharpsl_pm.machinfo->read_devdata(SHARPSL_BATT_VOLT); voltage = sharpsl_pm.machinfo->read_devdata(SHARPSL_BATT_VOLT);
if (voltage > 0)
if (voltage > 0) break;
if (i++ > 5) {
voltage = sharpsl_pm.machinfo->bat_levels_noac[0].voltage;
dev_warn(sharpsl_pm.dev, "Warning: Cannot read main battery!\n");
break; break;
} }
if (voltage <= 0) {
voltage = sharpsl_pm.machinfo->bat_levels_noac[0].voltage;
dev_warn(sharpsl_pm.dev, "Warning: Cannot read main battery!\n");
} }
voltage = sharpsl_average_value(voltage); voltage = sharpsl_average_value(voltage);
@ -267,7 +267,9 @@ static void sharpsl_battery_thread(struct work_struct *private_)
/* At low battery voltages, the voltage has a tendency to start /* At low battery voltages, the voltage has a tendency to start
creeping back up so we try to avoid this here */ creeping back up so we try to avoid this here */
if ((sharpsl_pm.battstat.ac_status == APM_AC_ONLINE) || (apm_status == APM_BATTERY_STATUS_HIGH) || percent <= sharpsl_pm.battstat.mainbat_percent) { if ((sharpsl_pm.battstat.ac_status == APM_AC_ONLINE)
|| (apm_status == APM_BATTERY_STATUS_HIGH)
|| percent <= sharpsl_pm.battstat.mainbat_percent) {
sharpsl_pm.battstat.mainbat_voltage = voltage; sharpsl_pm.battstat.mainbat_voltage = voltage;
sharpsl_pm.battstat.mainbat_status = apm_status; sharpsl_pm.battstat.mainbat_status = apm_status;
sharpsl_pm.battstat.mainbat_percent = percent; sharpsl_pm.battstat.mainbat_percent = percent;
@ -279,8 +281,8 @@ static void sharpsl_battery_thread(struct work_struct *private_)
#ifdef CONFIG_BACKLIGHT_CORGI #ifdef CONFIG_BACKLIGHT_CORGI
/* If battery is low. limit backlight intensity to save power. */ /* If battery is low. limit backlight intensity to save power. */
if ((sharpsl_pm.battstat.ac_status != APM_AC_ONLINE) if ((sharpsl_pm.battstat.ac_status != APM_AC_ONLINE)
&& ((sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_LOW) || && ((sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_LOW)
(sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_CRITICAL))) { || (sharpsl_pm.battstat.mainbat_status == APM_BATTERY_STATUS_CRITICAL))) {
if (!(sharpsl_pm.flags & SHARPSL_BL_LIMIT)) { if (!(sharpsl_pm.flags & SHARPSL_BL_LIMIT)) {
sharpsl_pm.machinfo->backlight_limit(1); sharpsl_pm.machinfo->backlight_limit(1);
sharpsl_pm.flags |= SHARPSL_BL_LIMIT; sharpsl_pm.flags |= SHARPSL_BL_LIMIT;
@ -346,7 +348,7 @@ static void sharpsl_charge_error(void)
static void sharpsl_charge_toggle(struct work_struct *private_) static void sharpsl_charge_toggle(struct work_struct *private_)
{ {
dev_dbg(sharpsl_pm.dev, "Toogling Charger at time: %lx\n", jiffies); dev_dbg(sharpsl_pm.dev, "Toggling Charger at time: %lx\n", jiffies);
if (!sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_ACIN)) { if (!sharpsl_pm.machinfo->read_devdata(SHARPSL_STATUS_ACIN)) {
sharpsl_charge_off(); sharpsl_charge_off();
@ -479,7 +481,7 @@ static int sharpsl_average_value(int ad)
for (i = 0; i < sharpsl_ad_index; i++) for (i = 0; i < sharpsl_ad_index; i++)
ad_val += sharpsl_ad[i]; ad_val += sharpsl_ad[i];
return (ad_val / sharpsl_ad_index); return ad_val / sharpsl_ad_index;
} }
/* /*
@ -516,7 +518,7 @@ static int get_select_val(int *val)
dev_dbg(sharpsl_pm.dev, "Average: %d from values: %d, %d, %d, %d, %d\n", sum/3, val[0], val[1], val[2], val[3], val[4]); dev_dbg(sharpsl_pm.dev, "Average: %d from values: %d, %d, %d, %d, %d\n", sum/3, val[0], val[1], val[2], val[3], val[4]);
return (sum/3); return sum/3;
} }
static int sharpsl_check_battery_temp(void) static int sharpsl_check_battery_temp(void)
@ -590,7 +592,7 @@ static int sharpsl_ac_check(void)
dev_dbg(sharpsl_pm.dev, "AC Voltage: %d\n", temp); dev_dbg(sharpsl_pm.dev, "AC Voltage: %d\n", temp);
if ((temp > sharpsl_pm.machinfo->charge_acin_high) || (temp < sharpsl_pm.machinfo->charge_acin_low)) { if ((temp > sharpsl_pm.machinfo->charge_acin_high) || (temp < sharpsl_pm.machinfo->charge_acin_low)) {
dev_err(sharpsl_pm.dev, "Error: AC check failed.\n"); dev_err(sharpsl_pm.dev, "Error: AC check failed: voltage %d.\n", temp);
return -1; return -1;
} }
@ -663,8 +665,7 @@ static void corgi_goto_sleep(unsigned long alarm_time, unsigned int alarm_enable
static int corgi_enter_suspend(unsigned long alarm_time, unsigned int alarm_enable, suspend_state_t state) static int corgi_enter_suspend(unsigned long alarm_time, unsigned int alarm_enable, suspend_state_t state)
{ {
if (!sharpsl_pm.machinfo->should_wakeup(!(sharpsl_pm.flags & SHARPSL_ALARM_ACTIVE) && alarm_enable) ) if (!sharpsl_pm.machinfo->should_wakeup(!(sharpsl_pm.flags & SHARPSL_ALARM_ACTIVE) && alarm_enable)) {
{
if (!(sharpsl_pm.flags & SHARPSL_ALARM_ACTIVE)) { if (!(sharpsl_pm.flags & SHARPSL_ALARM_ACTIVE)) {
dev_dbg(sharpsl_pm.dev, "No user triggered wakeup events and not charging. Strange. Suspend.\n"); dev_dbg(sharpsl_pm.dev, "No user triggered wakeup events and not charging. Strange. Suspend.\n");
corgi_goto_sleep(alarm_time, alarm_enable, state); corgi_goto_sleep(alarm_time, alarm_enable, state);
@ -837,7 +838,7 @@ static int sharpsl_off_charge_battery(void)
time = RCNR; time = RCNR;
while (1) { while (1) {
/* Check if any wakeup event had occurred */ /* Check if any wakeup event had occurred */
if (sharpsl_pm.machinfo->charger_wakeup() != 0) if (sharpsl_pm.machinfo->charger_wakeup())
return 0; return 0;
/* Check for timeout */ /* Check for timeout */
if ((RCNR-time) > SHARPSL_WAIT_CO_TIME) { if ((RCNR-time) > SHARPSL_WAIT_CO_TIME) {
@ -943,8 +944,7 @@ static int __init sharpsl_pm_probe(struct platform_device *pdev)
} }
} }
if (sharpsl_pm.machinfo->batfull_irq) if (sharpsl_pm.machinfo->batfull_irq) {
{
/* Register interrupt handler. */ /* Register interrupt handler. */
if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batfull), sharpsl_chrg_full_isr, IRQF_DISABLED | IRQF_TRIGGER_RISING, "CO", sharpsl_chrg_full_isr)) { if (request_irq(IRQ_GPIO(sharpsl_pm.machinfo->gpio_batfull), sharpsl_chrg_full_isr, IRQF_DISABLED | IRQF_TRIGGER_RISING, "CO", sharpsl_chrg_full_isr)) {
dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo->gpio_batfull)); dev_err(sharpsl_pm.dev, "Could not get irq %d.\n", IRQ_GPIO(sharpsl_pm.machinfo->gpio_batfull));

2
arch/arm/mach-pxa/spitz_pm.c
View file

@ -103,7 +103,7 @@ static void spitz_presuspend(void)
PFER = GPIO_bit(SPITZ_GPIO_KEY_INT) | GPIO_bit(SPITZ_GPIO_RESET); PFER = GPIO_bit(SPITZ_GPIO_KEY_INT) | GPIO_bit(SPITZ_GPIO_RESET);
PWER = GPIO_bit(SPITZ_GPIO_KEY_INT) | GPIO_bit(SPITZ_GPIO_RESET) | PWER_RTC; PWER = GPIO_bit(SPITZ_GPIO_KEY_INT) | GPIO_bit(SPITZ_GPIO_RESET) | PWER_RTC;
PKWR = GPIO_bit(SPITZ_GPIO_SYNC) | GPIO_bit(SPITZ_GPIO_KEY_INT) | GPIO_bit(SPITZ_GPIO_RESET); PKWR = GPIO_bit(SPITZ_GPIO_SYNC) | GPIO_bit(SPITZ_GPIO_KEY_INT) | GPIO_bit(SPITZ_GPIO_RESET);
PKSR = 0xffffffff; // clear PKSR = 0xffffffff; /* clear */
/* nRESET_OUT Disable */ /* nRESET_OUT Disable */
PSLR |= PSLR_SL_ROD; PSLR |= PSLR_SL_ROD;