Commit 3c101c41 authored by Tony Lindgren's avatar Tony Lindgren

Merge tag 'omap-cleanup-b-for-3.7' of...

Merge tag 'omap-cleanup-b-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into cleanup-makefile-sparse

smatch and string-wrapping cleanups for the OMAP subarch code.

These changes fix some of the more meaningful warnings that smatch
returns for the OMAP subarch code, and unwraps strings that are
wrapped at the 80-column boundary, to conform with the current
practice.

Basic build, boot, and PM logs are available here:

http://www.pwsan.com/omap/testlogs/warnings_a_cleanup_3.7/20120912025927/
parents f191f40c 7852ec05
...@@ -475,8 +475,7 @@ static void __init htcherald_lcd_init(void) ...@@ -475,8 +475,7 @@ static void __init htcherald_lcd_init(void)
break; break;
} }
if (!tries) if (!tries)
printk(KERN_WARNING "Timeout waiting for end of frame " pr_err("Timeout waiting for end of frame -- LCD may not be available\n");
"-- LCD may not be available\n");
/* turn off DMA */ /* turn off DMA */
reg = omap_readw(OMAP_DMA_LCD_CCR); reg = omap_readw(OMAP_DMA_LCD_CCR);
......
...@@ -587,8 +587,8 @@ void omap1_clk_disable_unused(struct clk *clk) ...@@ -587,8 +587,8 @@ void omap1_clk_disable_unused(struct clk *clk)
/* Clocks in the DSP domain need api_ck. Just assume bootloader /* Clocks in the DSP domain need api_ck. Just assume bootloader
* has not enabled any DSP clocks */ * has not enabled any DSP clocks */
if (clk->enable_reg == DSP_IDLECT2) { if (clk->enable_reg == DSP_IDLECT2) {
printk(KERN_INFO "Skipping reset check for DSP domain " pr_info("Skipping reset check for DSP domain clock \"%s\"\n",
"clock \"%s\"\n", clk->name); clk->name);
return; return;
} }
......
...@@ -775,11 +775,10 @@ static struct clk_functions omap1_clk_functions = { ...@@ -775,11 +775,10 @@ static struct clk_functions omap1_clk_functions = {
static void __init omap1_show_rates(void) static void __init omap1_show_rates(void)
{ {
pr_notice("Clocking rate (xtal/DPLL1/MPU): " pr_notice("Clocking rate (xtal/DPLL1/MPU): %ld.%01ld/%ld.%01ld/%ld.%01ld MHz\n",
"%ld.%01ld/%ld.%01ld/%ld.%01ld MHz\n", ck_ref.rate / 1000000, (ck_ref.rate / 100000) % 10,
ck_ref.rate / 1000000, (ck_ref.rate / 100000) % 10, ck_dpll1.rate / 1000000, (ck_dpll1.rate / 100000) % 10,
ck_dpll1.rate / 1000000, (ck_dpll1.rate / 100000) % 10, arm_ck.rate / 1000000, (arm_ck.rate / 100000) % 10);
arm_ck.rate / 1000000, (arm_ck.rate / 100000) % 10);
} }
u32 cpu_mask; u32 cpu_mask;
...@@ -840,8 +839,8 @@ int __init omap1_clk_init(void) ...@@ -840,8 +839,8 @@ int __init omap1_clk_init(void)
if (cpu_is_omap16xx() && crystal_type == 2) if (cpu_is_omap16xx() && crystal_type == 2)
ck_ref.rate = 19200000; ck_ref.rate = 19200000;
pr_info("Clocks: ARM_SYSST: 0x%04x DPLL_CTL: 0x%04x ARM_CKCTL: " pr_info("Clocks: ARM_SYSST: 0x%04x DPLL_CTL: 0x%04x ARM_CKCTL: 0x%04x\n",
"0x%04x\n", omap_readw(ARM_SYSST), omap_readw(DPLL_CTL), omap_readw(ARM_SYSST), omap_readw(DPLL_CTL),
omap_readw(ARM_CKCTL)); omap_readw(ARM_CKCTL));
/* We want to be in syncronous scalable mode */ /* We want to be in syncronous scalable mode */
......
...@@ -331,8 +331,9 @@ static int __init omap1_system_dma_init(void) ...@@ -331,8 +331,9 @@ static int __init omap1_system_dma_init(void)
d->chan = kzalloc(sizeof(struct omap_dma_lch) * d->chan = kzalloc(sizeof(struct omap_dma_lch) *
(d->lch_count), GFP_KERNEL); (d->lch_count), GFP_KERNEL);
if (!d->chan) { if (!d->chan) {
dev_err(&pdev->dev, "%s: Memory allocation failed" dev_err(&pdev->dev,
"for d->chan!!!\n", __func__); "%s: Memory allocation failed for d->chan!\n",
__func__);
goto exit_release_d; goto exit_release_d;
} }
......
...@@ -113,8 +113,7 @@ EXPORT_SYMBOL(omap_set_lcd_dma_b1_mirror); ...@@ -113,8 +113,7 @@ EXPORT_SYMBOL(omap_set_lcd_dma_b1_mirror);
void omap_set_lcd_dma_b1_vxres(unsigned long vxres) void omap_set_lcd_dma_b1_vxres(unsigned long vxres)
{ {
if (cpu_is_omap15xx()) { if (cpu_is_omap15xx()) {
printk(KERN_ERR "DMA virtual resolution is not supported " pr_err("DMA virtual resolution is not supported in 1510 mode\n");
"in 1510 mode\n");
BUG(); BUG();
} }
lcd_dma.vxres = vxres; lcd_dma.vxres = vxres;
...@@ -437,8 +436,7 @@ static int __init omap_init_lcd_dma(void) ...@@ -437,8 +436,7 @@ static int __init omap_init_lcd_dma(void)
r = request_irq(INT_DMA_LCD, lcd_dma_irq_handler, 0, r = request_irq(INT_DMA_LCD, lcd_dma_irq_handler, 0,
"LCD DMA", NULL); "LCD DMA", NULL);
if (r != 0) if (r != 0)
printk(KERN_ERR "unable to request IRQ for LCD DMA " pr_err("unable to request IRQ for LCD DMA (error %d)\n", r);
"(error %d)\n", r);
return r; return r;
} }
......
...@@ -69,11 +69,13 @@ void h2p2_dbg_leds_event(led_event_t evt) ...@@ -69,11 +69,13 @@ void h2p2_dbg_leds_event(led_event_t evt)
gpio_set_value(GPIO_IDLE, 0); gpio_set_value(GPIO_IDLE, 0);
} }
__raw_writew(~0, &fpga->leds);
led_state &= ~LED_STATE_ENABLED; led_state &= ~LED_STATE_ENABLED;
if (evt == led_halted) { if (fpga) {
iounmap(fpga); __raw_writew(~0, &fpga->leds);
fpga = NULL; if (evt == led_halted) {
iounmap(fpga);
fpga = NULL;
}
} }
goto done; goto done;
...@@ -159,7 +161,7 @@ void h2p2_dbg_leds_event(led_event_t evt) ...@@ -159,7 +161,7 @@ void h2p2_dbg_leds_event(led_event_t evt)
/* /*
* Actually burn the LEDs * Actually burn the LEDs
*/ */
if (led_state & LED_STATE_ENABLED) if (led_state & LED_STATE_ENABLED && fpga)
__raw_writew(~hw_led_state, &fpga->leds); __raw_writew(~hw_led_state, &fpga->leds);
done: done:
......
...@@ -550,8 +550,8 @@ static int n8x0_auto_sleep_regulators(void) ...@@ -550,8 +550,8 @@ static int n8x0_auto_sleep_regulators(void)
ret = menelaus_set_regulator_sleep(1, val); ret = menelaus_set_regulator_sleep(1, val);
if (ret < 0) { if (ret < 0) {
printk(KERN_ERR "Could not set regulators to sleep on " pr_err("Could not set regulators to sleep on menelaus: %u\n",
"menelaus: %u\n", ret); ret);
return ret; return ret;
} }
return 0; return 0;
...@@ -563,8 +563,7 @@ static int n8x0_auto_voltage_scale(void) ...@@ -563,8 +563,7 @@ static int n8x0_auto_voltage_scale(void)
ret = menelaus_set_vcore_hw(1400, 1050); ret = menelaus_set_vcore_hw(1400, 1050);
if (ret < 0) { if (ret < 0) {
printk(KERN_ERR "Could not set VCORE voltage on " pr_err("Could not set VCORE voltage on menelaus: %u\n", ret);
"menelaus: %u\n", ret);
return ret; return ret;
} }
return 0; return 0;
......
...@@ -516,8 +516,7 @@ static void __init overo_init(void) ...@@ -516,8 +516,7 @@ static void __init overo_init(void)
udelay(10); udelay(10);
gpio_set_value(OVERO_GPIO_W2W_NRESET, 1); gpio_set_value(OVERO_GPIO_W2W_NRESET, 1);
} else { } else {
printk(KERN_ERR "could not obtain gpio for " pr_err("could not obtain gpio for OVERO_GPIO_W2W_NRESET\n");
"OVERO_GPIO_W2W_NRESET\n");
} }
ret = gpio_request_array(overo_bt_gpios, ARRAY_SIZE(overo_bt_gpios)); ret = gpio_request_array(overo_bt_gpios, ARRAY_SIZE(overo_bt_gpios));
...@@ -536,8 +535,7 @@ static void __init overo_init(void) ...@@ -536,8 +535,7 @@ static void __init overo_init(void)
if (ret == 0) if (ret == 0)
gpio_export(OVERO_GPIO_USBH_CPEN, 0); gpio_export(OVERO_GPIO_USBH_CPEN, 0);
else else
printk(KERN_ERR "could not obtain gpio for " pr_err("could not obtain gpio for OVERO_GPIO_USBH_CPEN\n");
"OVERO_GPIO_USBH_CPEN\n");
} }
MACHINE_START(OVERO, "Gumstix Overo") MACHINE_START(OVERO, "Gumstix Overo")
......
...@@ -84,8 +84,7 @@ static inline void __init zoom_init_quaduart(void) ...@@ -84,8 +84,7 @@ static inline void __init zoom_init_quaduart(void)
quart_cs = ZOOM_QUADUART_CS; quart_cs = ZOOM_QUADUART_CS;
if (gpmc_cs_request(quart_cs, SZ_1M, &cs_mem_base) < 0) { if (gpmc_cs_request(quart_cs, SZ_1M, &cs_mem_base) < 0) {
printk(KERN_ERR "Failed to request GPMC mem" pr_err("Failed to request GPMC mem for Quad UART(TL16CP754C)\n");
"for Quad UART(TL16CP754C)\n");
return; return;
} }
...@@ -107,8 +106,8 @@ static inline int omap_zoom_debugboard_detect(void) ...@@ -107,8 +106,8 @@ static inline int omap_zoom_debugboard_detect(void)
if (gpio_request_one(debug_board_detect, GPIOF_IN, if (gpio_request_one(debug_board_detect, GPIOF_IN,
"Zoom debug board detect") < 0) { "Zoom debug board detect") < 0) {
printk(KERN_ERR "Failed to request GPIO%d for Zoom debug" pr_err("Failed to request GPIO%d for Zoom debug board detect\n",
"board detect\n", debug_board_detect); debug_board_detect);
return 0; return 0;
} }
......
...@@ -92,15 +92,13 @@ int omap3_core_dpll_m2_set_rate(struct clk *clk, unsigned long rate) ...@@ -92,15 +92,13 @@ int omap3_core_dpll_m2_set_rate(struct clk *clk, unsigned long rate)
pr_debug("clock: changing CORE DPLL rate from %lu to %lu\n", clk->rate, pr_debug("clock: changing CORE DPLL rate from %lu to %lu\n", clk->rate,
validrate); validrate);
pr_debug("clock: SDRC CS0 timing params used:" pr_debug("clock: SDRC CS0 timing params used: RFR %08x CTRLA %08x CTRLB %08x MR %08x\n",
" RFR %08x CTRLA %08x CTRLB %08x MR %08x\n",
sdrc_cs0->rfr_ctrl, sdrc_cs0->actim_ctrla, sdrc_cs0->rfr_ctrl, sdrc_cs0->actim_ctrla,
sdrc_cs0->actim_ctrlb, sdrc_cs0->mr); sdrc_cs0->actim_ctrlb, sdrc_cs0->mr);
if (sdrc_cs1) if (sdrc_cs1)
pr_debug("clock: SDRC CS1 timing params used: " pr_debug("clock: SDRC CS1 timing params used: RFR %08x CTRLA %08x CTRLB %08x MR %08x\n",
" RFR %08x CTRLA %08x CTRLB %08x MR %08x\n", sdrc_cs1->rfr_ctrl, sdrc_cs1->actim_ctrla,
sdrc_cs1->rfr_ctrl, sdrc_cs1->actim_ctrla, sdrc_cs1->actim_ctrlb, sdrc_cs1->mr);
sdrc_cs1->actim_ctrlb, sdrc_cs1->mr);
if (sdrc_cs1) if (sdrc_cs1)
omap3_configure_core_dpll( omap3_configure_core_dpll(
......
...@@ -71,8 +71,8 @@ static const struct clksel *_get_clksel_by_parent(struct clk *clk, ...@@ -71,8 +71,8 @@ static const struct clksel *_get_clksel_by_parent(struct clk *clk,
if (!clks->parent) { if (!clks->parent) {
/* This indicates a data problem */ /* This indicates a data problem */
WARN(1, "clock: Could not find parent clock %s in clksel array " WARN(1, "clock: %s: could not find parent clock %s in clksel array\n",
"of clock %s\n", src_clk->name, clk->name); clk->name, src_clk->name);
return NULL; return NULL;
} }
...@@ -126,8 +126,8 @@ static u8 _get_div_and_fieldval(struct clk *src_clk, struct clk *clk, ...@@ -126,8 +126,8 @@ static u8 _get_div_and_fieldval(struct clk *src_clk, struct clk *clk,
if (max_div == 0) { if (max_div == 0) {
/* This indicates an error in the clksel data */ /* This indicates an error in the clksel data */
WARN(1, "clock: Could not find divisor for clock %s parent %s" WARN(1, "clock: %s: could not find divisor for parent %s\n",
"\n", clk->name, src_clk->parent->name); clk->name, src_clk->parent->name);
return 0; return 0;
} }
...@@ -191,8 +191,8 @@ static u32 _clksel_to_divisor(struct clk *clk, u32 field_val) ...@@ -191,8 +191,8 @@ static u32 _clksel_to_divisor(struct clk *clk, u32 field_val)
if (!clkr->div) { if (!clkr->div) {
/* This indicates a data error */ /* This indicates a data error */
WARN(1, "clock: Could not find fieldval %d for clock %s parent " WARN(1, "clock: %s: could not find fieldval %d parent %s\n",
"%s\n", field_val, clk->name, clk->parent->name); clk->name, field_val, clk->parent->name);
return 0; return 0;
} }
...@@ -230,8 +230,8 @@ static u32 _divisor_to_clksel(struct clk *clk, u32 div) ...@@ -230,8 +230,8 @@ static u32 _divisor_to_clksel(struct clk *clk, u32 div)
} }
if (!clkr->div) { if (!clkr->div) {
pr_err("clock: Could not find divisor %d for clock %s parent " pr_err("clock: %s: could not find divisor %d parent %s\n",
"%s\n", div, clk->name, clk->parent->name); clk->name, div, clk->parent->name);
return ~0; return ~0;
} }
...@@ -300,8 +300,8 @@ u32 omap2_clksel_round_rate_div(struct clk *clk, unsigned long target_rate, ...@@ -300,8 +300,8 @@ u32 omap2_clksel_round_rate_div(struct clk *clk, unsigned long target_rate,
/* Sanity check */ /* Sanity check */
if (clkr->div <= last_div) if (clkr->div <= last_div)
pr_err("clock: clksel_rate table not sorted " pr_err("clock: %s: clksel_rate table not sorted",
"for clock %s", clk->name); clk->name);
last_div = clkr->div; last_div = clkr->div;
...@@ -312,9 +312,8 @@ u32 omap2_clksel_round_rate_div(struct clk *clk, unsigned long target_rate, ...@@ -312,9 +312,8 @@ u32 omap2_clksel_round_rate_div(struct clk *clk, unsigned long target_rate,
} }
if (!clkr->div) { if (!clkr->div) {
pr_err("clock: Could not find divisor for target " pr_err("clock: %s: could not find divisor for target rate %ld parent %s\n",
"rate %ld for clock %s parent %s\n", target_rate, clk->name, target_rate, clk->parent->name);
clk->name, clk->parent->name);
return ~0; return ~0;
} }
...@@ -359,8 +358,7 @@ void omap2_init_clksel_parent(struct clk *clk) ...@@ -359,8 +358,7 @@ void omap2_init_clksel_parent(struct clk *clk)
if (clkr->val == r) { if (clkr->val == r) {
if (clk->parent != clks->parent) { if (clk->parent != clks->parent) {
pr_debug("clock: inited %s parent " pr_debug("clock: %s: inited parent to %s (was %s)\n",
"to %s (was %s)\n",
clk->name, clks->parent->name, clk->name, clks->parent->name,
((clk->parent) ? ((clk->parent) ?
clk->parent->name : "NULL")); clk->parent->name : "NULL"));
......
...@@ -105,13 +105,13 @@ static int _dpll_test_fint(struct clk *clk, u8 n) ...@@ -105,13 +105,13 @@ static int _dpll_test_fint(struct clk *clk, u8 n)
} }
if (fint < fint_min) { if (fint < fint_min) {
pr_debug("rejecting n=%d due to Fint failure, " pr_debug("rejecting n=%d due to Fint failure, lowering max_divider\n",
"lowering max_divider\n", n); n);
dd->max_divider = n; dd->max_divider = n;
ret = DPLL_FINT_UNDERFLOW; ret = DPLL_FINT_UNDERFLOW;
} else if (fint > fint_max) { } else if (fint > fint_max) {
pr_debug("rejecting n=%d due to Fint failure, " pr_debug("rejecting n=%d due to Fint failure, boosting min_divider\n",
"boosting min_divider\n", n); n);
dd->min_divider = n; dd->min_divider = n;
ret = DPLL_FINT_INVALID; ret = DPLL_FINT_INVALID;
} else if (cpu_is_omap3430() && fint > OMAP3430_DPLL_FINT_BAND1_MAX && } else if (cpu_is_omap3430() && fint > OMAP3430_DPLL_FINT_BAND1_MAX &&
......
...@@ -104,8 +104,8 @@ void omap2_init_clk_clkdm(struct clk *clk) ...@@ -104,8 +104,8 @@ void omap2_init_clk_clkdm(struct clk *clk)
clk->name, clk->clkdm_name); clk->name, clk->clkdm_name);
clk->clkdm = clkdm; clk->clkdm = clkdm;
} else { } else {
pr_debug("clock: could not associate clk %s to " pr_debug("clock: could not associate clk %s to clkdm %s\n",
"clkdm %s\n", clk->name, clk->clkdm_name); clk->name, clk->clkdm_name);
} }
} }
...@@ -228,8 +228,7 @@ void omap2_dflt_clk_disable(struct clk *clk) ...@@ -228,8 +228,7 @@ void omap2_dflt_clk_disable(struct clk *clk)
* 'Independent' here refers to a clock which is not * 'Independent' here refers to a clock which is not
* controlled by its parent. * controlled by its parent.
*/ */
printk(KERN_ERR "clock: clk_disable called on independent " pr_err("clock: clk_disable called on independent clock %s which has no enable_reg\n", clk->name);
"clock %s which has no enable_reg\n", clk->name);
return; return;
} }
...@@ -272,8 +271,7 @@ const struct clkops clkops_omap2_dflt = { ...@@ -272,8 +271,7 @@ const struct clkops clkops_omap2_dflt = {
void omap2_clk_disable(struct clk *clk) void omap2_clk_disable(struct clk *clk)
{ {
if (clk->usecount == 0) { if (clk->usecount == 0) {
WARN(1, "clock: %s: omap2_clk_disable() called, but usecount " WARN(1, "clock: %s: omap2_clk_disable() called, but usecount already 0?", clk->name);
"already 0?", clk->name);
return; return;
} }
...@@ -334,8 +332,8 @@ int omap2_clk_enable(struct clk *clk) ...@@ -334,8 +332,8 @@ int omap2_clk_enable(struct clk *clk)
if (clkdm_control && clk->clkdm) { if (clkdm_control && clk->clkdm) {
ret = clkdm_clk_enable(clk->clkdm, clk); ret = clkdm_clk_enable(clk->clkdm, clk);
if (ret) { if (ret) {
WARN(1, "clock: %s: could not enable clockdomain %s: " WARN(1, "clock: %s: could not enable clockdomain %s: %d\n",
"%d\n", clk->name, clk->clkdm->name, ret); clk->name, clk->clkdm->name, ret);
goto oce_err2; goto oce_err2;
} }
} }
...@@ -503,10 +501,8 @@ void __init omap2_clk_print_new_rates(const char *hfclkin_ck_name, ...@@ -503,10 +501,8 @@ void __init omap2_clk_print_new_rates(const char *hfclkin_ck_name,
hfclkin_rate = clk_get_rate(hfclkin_ck); hfclkin_rate = clk_get_rate(hfclkin_ck);
pr_info("Switched to new clocking rate (Crystal/Core/MPU): " pr_info("Switched to new clocking rate (Crystal/Core/MPU): %ld.%01ld/%ld/%ld MHz\n",
"%ld.%01ld/%ld/%ld MHz\n", (hfclkin_rate / 1000000), ((hfclkin_rate / 100000) % 10),
(hfclkin_rate / 1000000),
((hfclkin_rate / 100000) % 10),
(clk_get_rate(core_ck) / 1000000), (clk_get_rate(core_ck) / 1000000),
(clk_get_rate(mpu_ck) / 1000000)); (clk_get_rate(mpu_ck) / 1000000));
} }
......
...@@ -49,8 +49,7 @@ int omap3_dpll4_set_rate(struct clk *clk, unsigned long rate) ...@@ -49,8 +49,7 @@ int omap3_dpll4_set_rate(struct clk *clk, unsigned long rate)
* on DPLL4. * on DPLL4.
*/ */
if (omap_rev() == OMAP3430_REV_ES1_0) { if (omap_rev() == OMAP3430_REV_ES1_0) {
pr_err("clock: DPLL4 cannot change rate due to " pr_err("clock: DPLL4 cannot change rate due to silicon 'Limitation 2.5' on 3430ES1.\n");
"silicon 'Limitation 2.5' on 3430ES1.\n");
return -EINVAL; return -EINVAL;
} }
......
...@@ -174,9 +174,8 @@ void _clkdm_add_autodeps(struct clockdomain *clkdm) ...@@ -174,9 +174,8 @@ void _clkdm_add_autodeps(struct clockdomain *clkdm)
if (IS_ERR(autodep->clkdm.ptr)) if (IS_ERR(autodep->clkdm.ptr))
continue; continue;
pr_debug("clockdomain: adding %s sleepdep/wkdep for " pr_debug("clockdomain: %s: adding %s sleepdep/wkdep\n",
"clkdm %s\n", autodep->clkdm.ptr->name, clkdm->name, autodep->clkdm.ptr->name);
clkdm->name);
clkdm_add_sleepdep(clkdm, autodep->clkdm.ptr); clkdm_add_sleepdep(clkdm, autodep->clkdm.ptr);
clkdm_add_wkdep(clkdm, autodep->clkdm.ptr); clkdm_add_wkdep(clkdm, autodep->clkdm.ptr);
...@@ -205,9 +204,8 @@ void _clkdm_del_autodeps(struct clockdomain *clkdm) ...@@ -205,9 +204,8 @@ void _clkdm_del_autodeps(struct clockdomain *clkdm)
if (IS_ERR(autodep->clkdm.ptr)) if (IS_ERR(autodep->clkdm.ptr))
continue; continue;
pr_debug("clockdomain: removing %s sleepdep/wkdep for " pr_debug("clockdomain: %s: removing %s sleepdep/wkdep\n",
"clkdm %s\n", autodep->clkdm.ptr->name, clkdm->name, autodep->clkdm.ptr->name);
clkdm->name);
clkdm_del_sleepdep(clkdm, autodep->clkdm.ptr); clkdm_del_sleepdep(clkdm, autodep->clkdm.ptr);
clkdm_del_wkdep(clkdm, autodep->clkdm.ptr); clkdm_del_wkdep(clkdm, autodep->clkdm.ptr);
...@@ -469,14 +467,14 @@ int clkdm_add_wkdep(struct clockdomain *clkdm1, struct clockdomain *clkdm2) ...@@ -469,14 +467,14 @@ int clkdm_add_wkdep(struct clockdomain *clkdm1, struct clockdomain *clkdm2)
ret = -EINVAL; ret = -EINVAL;
if (ret) { if (ret) {
pr_debug("clockdomain: hardware cannot set/clear wake up of " pr_debug("clockdomain: hardware cannot set/clear wake up of %s when %s wakes up\n",
"%s when %s wakes up\n", clkdm1->name, clkdm2->name); clkdm1->name, clkdm2->name);
return ret; return ret;
} }
if (atomic_inc_return(&cd->wkdep_usecount) == 1) { if (atomic_inc_return(&cd->wkdep_usecount) == 1) {
pr_debug("clockdomain: hardware will wake up %s when %s wakes " pr_debug("clockdomain: hardware will wake up %s when %s wakes up\n",
"up\n", clkdm1->name, clkdm2->name); clkdm1->name, clkdm2->name);
ret = arch_clkdm->clkdm_add_wkdep(clkdm1, clkdm2); ret = arch_clkdm->clkdm_add_wkdep(clkdm1, clkdm2);
} }
...@@ -510,14 +508,14 @@ int clkdm_del_wkdep(struct clockdomain *clkdm1, struct clockdomain *clkdm2) ...@@ -510,14 +508,14 @@ int clkdm_del_wkdep(struct clockdomain *clkdm1, struct clockdomain *clkdm2)
ret = -EINVAL; ret = -EINVAL;
if (ret) { if (ret) {
pr_debug("clockdomain: hardware cannot set/clear wake up of " pr_debug("clockdomain: hardware cannot set/clear wake up of %s when %s wakes up\n",
"%s when %s wakes up\n", clkdm1->name, clkdm2->name); clkdm1->name, clkdm2->name);
return ret; return ret;
} }
if (atomic_dec_return(&cd->wkdep_usecount) == 0) { if (atomic_dec_return(&cd->wkdep_usecount) == 0) {
pr_debug("clockdomain: hardware will no longer wake up %s " pr_debug("clockdomain: hardware will no longer wake up %s after %s wakes up\n",
"after %s wakes up\n", clkdm1->name, clkdm2->name); clkdm1->name, clkdm2->name);
ret = arch_clkdm->clkdm_del_wkdep(clkdm1, clkdm2); ret = arch_clkdm->clkdm_del_wkdep(clkdm1, clkdm2);
} }
...@@ -555,8 +553,8 @@ int clkdm_read_wkdep(struct clockdomain *clkdm1, struct clockdomain *clkdm2) ...@@ -555,8 +553,8 @@ int clkdm_read_wkdep(struct clockdomain *clkdm1, struct clockdomain *clkdm2)
ret = -EINVAL; ret = -EINVAL;
if (ret) { if (ret) {
pr_debug("clockdomain: hardware cannot set/clear wake up of " pr_debug("clockdomain: hardware cannot set/clear wake up of %s when %s wakes up\n",
"%s when %s wakes up\n", clkdm1->name, clkdm2->name); clkdm1->name, clkdm2->name);
return ret; return ret;
} }
...@@ -613,15 +611,14 @@ int clkdm_add_sleepdep(struct clockdomain *clkdm1, struct clockdomain *clkdm2) ...@@ -613,15 +611,14 @@ int clkdm_add_sleepdep(struct clockdomain *clkdm1, struct clockdomain *clkdm2)
ret = -EINVAL; ret = -EINVAL;
if (ret) { if (ret) {
pr_debug("clockdomain: hardware cannot set/clear sleep " pr_debug("clockdomain: hardware cannot set/clear sleep dependency affecting %s from %s\n",
"dependency affecting %s from %s\n", clkdm1->name, clkdm1->name, clkdm2->name);
clkdm2->name);
return ret; return ret;
} }
if (atomic_inc_return(&cd->sleepdep_usecount) == 1) { if (atomic_inc_return(&cd->sleepdep_usecount) == 1) {
pr_debug("clockdomain: will prevent %s from sleeping if %s " pr_debug("clockdomain: will prevent %s from sleeping if %s is active\n",
"is active\n", clkdm1->name, clkdm2->name); clkdm1->name, clkdm2->name);
ret = arch_clkdm->clkdm_add_sleepdep(clkdm1, clkdm2); ret = arch_clkdm->clkdm_add_sleepdep(clkdm1, clkdm2);
} }
...@@ -657,16 +654,14 @@ int clkdm_del_sleepdep(struct clockdomain *clkdm1, struct clockdomain *clkdm2) ...@@ -657,16 +654,14 @@ int clkdm_del_sleepdep(struct clockdomain *clkdm1, struct clockdomain *clkdm2)
ret = -EINVAL; ret = -EINVAL;
if (ret) { if (ret) {
pr_debug("clockdomain: hardware cannot set/clear sleep " pr_debug("clockdomain: hardware cannot set/clear sleep dependency affecting %s from %s\n",
"dependency affecting %s from %s\n", clkdm1->name, clkdm1->name, clkdm2->name);
clkdm2->name);
return ret; return ret;
} }
if (atomic_dec_return(&cd->sleepdep_usecount) == 0) { if (atomic_dec_return(&cd->sleepdep_usecount) == 0) {
pr_debug("clockdomain: will no longer prevent %s from " pr_debug("clockdomain: will no longer prevent %s from sleeping if %s is active\n",
"sleeping if %s is active\n", clkdm1->name, clkdm1->name, clkdm2->name);
clkdm2->name);
ret = arch_clkdm->clkdm_del_sleepdep(clkdm1, clkdm2); ret = arch_clkdm->clkdm_del_sleepdep(clkdm1, clkdm2);
} }
...@@ -706,9 +701,8 @@ int clkdm_read_sleepdep(struct clockdomain *clkdm1, struct clockdomain *clkdm2) ...@@ -706,9 +701,8 @@ int clkdm_read_sleepdep(struct clockdomain *clkdm1, struct clockdomain *clkdm2)
ret = -EINVAL; ret = -EINVAL;
if (ret) { if (ret) {
pr_debug("clockdomain: hardware cannot set/clear sleep " pr_debug("clockdomain: hardware cannot set/clear sleep dependency affecting %s from %s\n",
"dependency affecting %s from %s\n", clkdm1->name, clkdm1->name, clkdm2->name);
clkdm2->name);
return ret; return ret;
} }
...@@ -755,8 +749,8 @@ int clkdm_sleep(struct clockdomain *clkdm) ...@@ -755,8 +749,8 @@ int clkdm_sleep(struct clockdomain *clkdm)
return -EINVAL; return -EINVAL;
if (!(clkdm->flags & CLKDM_CAN_FORCE_SLEEP)) { if (!(clkdm->flags & CLKDM_CAN_FORCE_SLEEP)) {
pr_debug("clockdomain: %s does not support forcing " pr_debug("clockdomain: %s does not support forcing sleep via software\n",
"sleep via software\n", clkdm->name); clkdm->name);
return -EINVAL; return -EINVAL;
} }
...@@ -790,8 +784,8 @@ int clkdm_wakeup(struct clockdomain *clkdm) ...@@ -790,8 +784,8 @@ int clkdm_wakeup(struct clockdomain *clkdm)
return -EINVAL; return -EINVAL;
if (!(clkdm->flags & CLKDM_CAN_FORCE_WAKEUP)) { if (!(clkdm->flags & CLKDM_CAN_FORCE_WAKEUP)) {
pr_debug("clockdomain: %s does not support forcing " pr_debug("clockdomain: %s does not support forcing wakeup via software\n",
"wakeup via software\n", clkdm->name); clkdm->name);
return -EINVAL; return -EINVAL;
} }
...@@ -826,8 +820,8 @@ void clkdm_allow_idle(struct clockdomain *clkdm) ...@@ -826,8 +820,8 @@ void clkdm_allow_idle(struct clockdomain *clkdm)
return; return;
if (!(clkdm->flags & CLKDM_CAN_ENABLE_AUTO)) { if (!(clkdm->flags & CLKDM_CAN_ENABLE_AUTO)) {
pr_debug("clock: automatic idle transitions cannot be enabled " pr_debug("clock: %s: automatic idle transitions cannot be enabled\n",
"on clockdomain %s\n", clkdm->name); clkdm->name);
return; return;
} }
...@@ -861,8 +855,8 @@ void clkdm_deny_idle(struct clockdomain *clkdm) ...@@ -861,8 +855,8 @@ void clkdm_deny_idle(struct clockdomain *clkdm)
return; return;
if (!(clkdm->flags & CLKDM_CAN_DISABLE_AUTO)) { if (!(clkdm->flags & CLKDM_CAN_DISABLE_AUTO)) {
pr_debug("clockdomain: automatic idle transitions cannot be " pr_debug("clockdomain: %s: automatic idle transitions cannot be disabled\n",
"disabled on %s\n", clkdm->name); clkdm->name);
return; return;
} }
...@@ -927,7 +921,7 @@ static int _clkdm_clk_hwmod_enable(struct clockdomain *clkdm) ...@@ -927,7 +921,7 @@ static int _clkdm_clk_hwmod_enable(struct clockdomain *clkdm)
pwrdm_state_switch(clkdm->pwrdm.ptr); pwrdm_state_switch(clkdm->pwrdm.ptr);
spin_unlock_irqrestore(&clkdm->lock, flags); spin_unlock_irqrestore(&clkdm->lock, flags);
pr_debug("clockdomain: clkdm %s: enabled\n", clkdm->name); pr_debug("clockdomain: %s: enabled\n", clkdm->name);
return 0; return 0;
} }
...@@ -952,7 +946,7 @@ static int _clkdm_clk_hwmod_disable(struct clockdomain *clkdm) ...@@ -952,7 +946,7 @@ static int _clkdm_clk_hwmod_disable(struct clockdomain *clkdm)
pwrdm_state_switch(clkdm->pwrdm.ptr); pwrdm_state_switch(clkdm->pwrdm.ptr);
spin_unlock_irqrestore(&clkdm->lock, flags); spin_unlock_irqrestore(&clkdm->lock, flags);
pr_debug("clockdomain: clkdm %s: disabled\n", clkdm->name); pr_debug("clockdomain: %s: disabled\n", clkdm->name);
return 0; return 0;
} }
......
...@@ -120,8 +120,7 @@ void __init omap_nand_flash_init(int options, struct mtd_partition *parts, ...@@ -120,8 +120,7 @@ void __init omap_nand_flash_init(int options, struct mtd_partition *parts,
} }
if (nandcs > GPMC_CS_NUM) { if (nandcs > GPMC_CS_NUM) {
printk(KERN_INFO "NAND: Unable to find configuration " pr_info("NAND: Unable to find configuration in GPMC\n");
"in GPMC\n ");
return; return;
} }
......
...@@ -623,8 +623,11 @@ unsigned long omap3_clkoutx2_recalc(struct clk *clk) ...@@ -623,8 +623,11 @@ unsigned long omap3_clkoutx2_recalc(struct clk *clk)
while (pclk && !pclk->dpll_data) while (pclk && !pclk->dpll_data)
pclk = pclk->parent; pclk = pclk->parent;
/* clk does not have a DPLL as a parent? */ /* clk does not have a DPLL as a parent? error in the clock data */
WARN_ON(!pclk); if (!pclk) {
WARN_ON(1);
return 0;
}
dd = pclk->dpll_data; dd = pclk->dpll_data;
......
...@@ -61,6 +61,7 @@ static int __init omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused) ...@@ -61,6 +61,7 @@ static int __init omap2_gpio_dev_init(struct omap_hwmod *oh, void *unused)
pdata->regs = kzalloc(sizeof(struct omap_gpio_reg_offs), GFP_KERNEL); pdata->regs = kzalloc(sizeof(struct omap_gpio_reg_offs), GFP_KERNEL);
if (!pdata->regs) { if (!pdata->regs) {
pr_err("gpio%d: Memory allocation failed\n", id); pr_err("gpio%d: Memory allocation failed\n", id);
kfree(pdata);
return -ENOMEM; return -ENOMEM;
} }
......
...@@ -297,7 +297,7 @@ int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t) ...@@ -297,7 +297,7 @@ int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t)
div = gpmc_cs_calc_divider(cs, t->sync_clk); div = gpmc_cs_calc_divider(cs, t->sync_clk);
if (div < 0) if (div < 0)
return -1; return div;
GPMC_SET_ONE(GPMC_CS_CONFIG2, 0, 3, cs_on); GPMC_SET_ONE(GPMC_CS_CONFIG2, 0, 3, cs_on);
GPMC_SET_ONE(GPMC_CS_CONFIG2, 8, 12, cs_rd_off); GPMC_SET_ONE(GPMC_CS_CONFIG2, 8, 12, cs_rd_off);
......
...@@ -161,9 +161,8 @@ void __init omap2xxx_check_revision(void) ...@@ -161,9 +161,8 @@ void __init omap2xxx_check_revision(void)
} }
if (j == ARRAY_SIZE(omap_ids)) { if (j == ARRAY_SIZE(omap_ids)) {
printk(KERN_ERR "Unknown OMAP device type. " pr_err("Unknown OMAP device type. Handling it as OMAP%04x\n",
"Handling it as OMAP%04x\n", omap_ids[i].type >> 16);
omap_ids[i].type >> 16);
j = i; j = i;
} }
......
...@@ -108,9 +108,8 @@ static void __init omap_irq_bank_init_one(struct omap_irq_bank *bank) ...@@ -108,9 +108,8 @@ static void __init omap_irq_bank_init_one(struct omap_irq_bank *bank)
unsigned long tmp; unsigned long tmp;
tmp = intc_bank_read_reg(bank, INTC_REVISION) & 0xff; tmp = intc_bank_read_reg(bank, INTC_REVISION) & 0xff;
printk(KERN_INFO "IRQ: Found an INTC at 0x%p " pr_info("IRQ: Found an INTC at 0x%p (revision %ld.%ld) with %d interrupts\n",
"(revision %ld.%ld) with %d interrupts\n", bank->base_reg, tmp >> 4, tmp & 0xf, bank->nr_irqs);
bank->base_reg, tmp >> 4, tmp & 0xf, bank->nr_irqs);
tmp = intc_bank_read_reg(bank, INTC_SYSCONFIG); tmp = intc_bank_read_reg(bank, INTC_SYSCONFIG);
tmp |= 1 << 1; /* soft reset */ tmp |= 1 << 1; /* soft reset */
......
...@@ -1438,8 +1438,8 @@ static int _init_clocks(struct omap_hwmod *oh, void *data) ...@@ -1438,8 +1438,8 @@ static int _init_clocks(struct omap_hwmod *oh, void *data)
* Return the bit position of the reset line that match the * Return the bit position of the reset line that match the
* input name. Return -ENOENT if not found. * input name. Return -ENOENT if not found.
*/ */
static u8 _lookup_hardreset(struct omap_hwmod *oh, const char *name, static int _lookup_hardreset(struct omap_hwmod *oh, const char *name,
struct omap_hwmod_rst_info *ohri) struct omap_hwmod_rst_info *ohri)
{ {
int i; int i;
...@@ -1475,7 +1475,7 @@ static u8 _lookup_hardreset(struct omap_hwmod *oh, const char *name, ...@@ -1475,7 +1475,7 @@ static u8 _lookup_hardreset(struct omap_hwmod *oh, const char *name,
static int _assert_hardreset(struct omap_hwmod *oh, const char *name) static int _assert_hardreset(struct omap_hwmod *oh, const char *name)
{ {
struct omap_hwmod_rst_info ohri; struct omap_hwmod_rst_info ohri;
u8 ret = -EINVAL; int ret = -EINVAL;
if (!oh) if (!oh)
return -EINVAL; return -EINVAL;
...@@ -1484,7 +1484,7 @@ static int _assert_hardreset(struct omap_hwmod *oh, const char *name) ...@@ -1484,7 +1484,7 @@ static int _assert_hardreset(struct omap_hwmod *oh, const char *name)
return -ENOSYS; return -ENOSYS;
ret = _lookup_hardreset(oh, name, &ohri); ret = _lookup_hardreset(oh, name, &ohri);
if (IS_ERR_VALUE(ret)) if (ret < 0)
return ret; return ret;
ret = soc_ops.assert_hardreset(oh, &ohri); ret = soc_ops.assert_hardreset(oh, &ohri);
...@@ -1542,7 +1542,7 @@ static int _deassert_hardreset(struct omap_hwmod *oh, const char *name) ...@@ -1542,7 +1542,7 @@ static int _deassert_hardreset(struct omap_hwmod *oh, const char *name)
static int _read_hardreset(struct omap_hwmod *oh, const char *name) static int _read_hardreset(struct omap_hwmod *oh, const char *name)
{ {
struct omap_hwmod_rst_info ohri; struct omap_hwmod_rst_info ohri;
u8 ret = -EINVAL; int ret = -EINVAL;
if (!oh) if (!oh)
return -EINVAL; return -EINVAL;
...@@ -1551,7 +1551,7 @@ static int _read_hardreset(struct omap_hwmod *oh, const char *name) ...@@ -1551,7 +1551,7 @@ static int _read_hardreset(struct omap_hwmod *oh, const char *name)
return -ENOSYS; return -ENOSYS;
ret = _lookup_hardreset(oh, name, &ohri); ret = _lookup_hardreset(oh, name, &ohri);
if (IS_ERR_VALUE(ret)) if (ret < 0)
return ret; return ret;
return soc_ops.is_hardreset_asserted(oh, &ohri); return soc_ops.is_hardreset_asserted(oh, &ohri);
...@@ -1641,8 +1641,8 @@ static int _ocp_softreset(struct omap_hwmod *oh) ...@@ -1641,8 +1641,8 @@ static int _ocp_softreset(struct omap_hwmod *oh)
/* clocks must be on for this operation */ /* clocks must be on for this operation */
if (oh->_state != _HWMOD_STATE_ENABLED) { if (oh->_state != _HWMOD_STATE_ENABLED) {
pr_warning("omap_hwmod: %s: reset can only be entered from " pr_warn("omap_hwmod: %s: reset can only be entered from enabled state\n",
"enabled state\n", oh->name); oh->name);
return -EINVAL; return -EINVAL;
} }
......
...@@ -64,25 +64,22 @@ int __init omap_init_opp_table(struct omap_opp_def *opp_def, ...@@ -64,25 +64,22 @@ int __init omap_init_opp_table(struct omap_opp_def *opp_def,
} }
oh = omap_hwmod_lookup(opp_def->hwmod_name); oh = omap_hwmod_lookup(opp_def->hwmod_name);
if (!oh || !oh->od) { if (!oh || !oh->od) {
pr_debug("%s: no hwmod or odev for %s, [%d] " pr_debug("%s: no hwmod or odev for %s, [%d] cannot add OPPs.\n",
"cannot add OPPs.\n", __func__, __func__, opp_def->hwmod_name, i);
opp_def->hwmod_name, i);
continue; continue;
} }
dev = &oh->od->pdev->dev; dev = &oh->od->pdev->dev;
r = opp_add(dev, opp_def->freq, opp_def->u_volt); r = opp_add(dev, opp_def->freq, opp_def->u_volt);
if (r) { if (r) {
dev_err(dev, "%s: add OPP %ld failed for %s [%d] " dev_err(dev, "%s: add OPP %ld failed for %s [%d] result=%d\n",
"result=%d\n", __func__, opp_def->freq,
__func__, opp_def->freq, opp_def->hwmod_name, i, r);
opp_def->hwmod_name, i, r);
} else { } else {
if (!opp_def->default_available) if (!opp_def->default_available)
r = opp_disable(dev, opp_def->freq); r = opp_disable(dev, opp_def->freq);
if (r) if (r)
dev_err(dev, "%s: disable %ld failed for %s " dev_err(dev, "%s: disable %ld failed for %s [%d] result=%d\n",
"[%d] result=%d\n",
__func__, opp_def->freq, __func__, opp_def->freq,
opp_def->hwmod_name, i, r); opp_def->hwmod_name, i, r);
} }
......
...@@ -203,8 +203,8 @@ static int __init omap2_set_init_voltage(char *vdd_name, char *clk_name, ...@@ -203,8 +203,8 @@ static int __init omap2_set_init_voltage(char *vdd_name, char *clk_name,
bootup_volt = opp_get_voltage(opp); bootup_volt = opp_get_voltage(opp);
rcu_read_unlock(); rcu_read_unlock();
if (!bootup_volt) { if (!bootup_volt) {
pr_err("%s: unable to find voltage corresponding " pr_err("%s: unable to find voltage corresponding to the bootup OPP for vdd_%s\n",
"to the bootup OPP for vdd_%s\n", __func__, vdd_name); __func__, vdd_name);
goto exit; goto exit;
} }
......
...@@ -391,9 +391,8 @@ static int omap3_pm_suspend(void) ...@@ -391,9 +391,8 @@ static int omap3_pm_suspend(void)
list_for_each_entry(pwrst, &pwrst_list, node) { list_for_each_entry(pwrst, &pwrst_list, node) {
state = pwrdm_read_prev_pwrst(pwrst->pwrdm); state = pwrdm_read_prev_pwrst(pwrst->pwrdm);
if (state > pwrst->next_state) { if (state > pwrst->next_state) {
pr_info("Powerdomain (%s) didn't enter " pr_info("Powerdomain (%s) didn't enter target state %d\n",
"target state %d\n", pwrst->pwrdm->name, pwrst->next_state);
pwrst->pwrdm->name, pwrst->next_state);
ret = -1; ret = -1;
} }
omap_set_pwrdm_state(pwrst->pwrdm, pwrst->saved_state); omap_set_pwrdm_state(pwrst->pwrdm, pwrst->saved_state);
...@@ -733,8 +732,7 @@ int __init omap3_pm_init(void) ...@@ -733,8 +732,7 @@ int __init omap3_pm_init(void)
omap3_secure_ram_storage = omap3_secure_ram_storage =
kmalloc(0x803F, GFP_KERNEL); kmalloc(0x803F, GFP_KERNEL);
if (!omap3_secure_ram_storage) if (!omap3_secure_ram_storage)
pr_err("Memory allocation failed when " pr_err("Memory allocation failed when allocating for secure sram context\n");
"allocating for secure sram context\n");
local_irq_disable(); local_irq_disable();
local_fiq_disable(); local_fiq_disable();
......
...@@ -69,9 +69,8 @@ static int omap4_pm_suspend(void) ...@@ -69,9 +69,8 @@ static int omap4_pm_suspend(void)
list_for_each_entry(pwrst, &pwrst_list, node) { list_for_each_entry(pwrst, &pwrst_list, node) {
state = pwrdm_read_prev_pwrst(pwrst->pwrdm); state = pwrdm_read_prev_pwrst(pwrst->pwrdm);
if (state > pwrst->next_state) { if (state > pwrst->next_state) {
pr_info("Powerdomain (%s) didn't enter " pr_info("Powerdomain (%s) didn't enter target state %d\n",
"target state %d\n", pwrst->pwrdm->name, pwrst->next_state);
pwrst->pwrdm->name, pwrst->next_state);
ret = -1; ret = -1;
} }
omap_set_pwrdm_state(pwrst->pwrdm, pwrst->saved_state); omap_set_pwrdm_state(pwrst->pwrdm, pwrst->saved_state);
...@@ -189,8 +188,7 @@ int __init omap4_pm_init(void) ...@@ -189,8 +188,7 @@ int __init omap4_pm_init(void)
ret |= clkdm_add_wkdep(ducati_clkdm, l3_1_clkdm); ret |= clkdm_add_wkdep(ducati_clkdm, l3_1_clkdm);
ret |= clkdm_add_wkdep(ducati_clkdm, l3_2_clkdm); ret |= clkdm_add_wkdep(ducati_clkdm, l3_2_clkdm);
if (ret) { if (ret) {
pr_err("Failed to add MPUSS -> L3/EMIF/L4PER, DUCATI -> L3 " pr_err("Failed to add MPUSS -> L3/EMIF/L4PER, DUCATI -> L3 wakeup dependency\n");
"wakeup dependency\n");
goto err2; goto err2;
} }
......
...@@ -341,8 +341,8 @@ int pwrdm_add_clkdm(struct powerdomain *pwrdm, struct clockdomain *clkdm) ...@@ -341,8 +341,8 @@ int pwrdm_add_clkdm(struct powerdomain *pwrdm, struct clockdomain *clkdm)
if (!pwrdm || !clkdm) if (!pwrdm || !clkdm)
return -EINVAL; return -EINVAL;
pr_debug("powerdomain: associating clockdomain %s with powerdomain " pr_debug("powerdomain: %s: associating clockdomain %s\n",
"%s\n", clkdm->name, pwrdm->name); pwrdm->name, clkdm->name);
for (i = 0; i < PWRDM_MAX_CLKDMS; i++) { for (i = 0; i < PWRDM_MAX_CLKDMS; i++) {
if (!pwrdm->pwrdm_clkdms[i]) if (!pwrdm->pwrdm_clkdms[i])
...@@ -356,8 +356,8 @@ int pwrdm_add_clkdm(struct powerdomain *pwrdm, struct clockdomain *clkdm) ...@@ -356,8 +356,8 @@ int pwrdm_add_clkdm(struct powerdomain *pwrdm, struct clockdomain *clkdm)
} }
if (i == PWRDM_MAX_CLKDMS) { if (i == PWRDM_MAX_CLKDMS) {
pr_debug("powerdomain: increase PWRDM_MAX_CLKDMS for " pr_debug("powerdomain: %s: increase PWRDM_MAX_CLKDMS for clkdm %s\n",
"pwrdm %s clkdm %s\n", pwrdm->name, clkdm->name); pwrdm->name, clkdm->name);
WARN_ON(1); WARN_ON(1);
ret = -ENOMEM; ret = -ENOMEM;
goto pac_exit; goto pac_exit;
...@@ -389,16 +389,16 @@ int pwrdm_del_clkdm(struct powerdomain *pwrdm, struct clockdomain *clkdm) ...@@ -389,16 +389,16 @@ int pwrdm_del_clkdm(struct powerdomain *pwrdm, struct clockdomain *clkdm)
if (!pwrdm || !clkdm) if (!pwrdm || !clkdm)
return -EINVAL; return -EINVAL;
pr_debug("powerdomain: dissociating clockdomain %s from powerdomain " pr_debug("powerdomain: %s: dissociating clockdomain %s\n",
"%s\n", clkdm->name, pwrdm->name); pwrdm->name, clkdm->name);
for (i = 0; i < PWRDM_MAX_CLKDMS; i++) for (i = 0; i < PWRDM_MAX_CLKDMS; i++)
if (pwrdm->pwrdm_clkdms[i] == clkdm) if (pwrdm->pwrdm_clkdms[i] == clkdm)
break; break;
if (i == PWRDM_MAX_CLKDMS) { if (i == PWRDM_MAX_CLKDMS) {
pr_debug("powerdomain: clkdm %s not associated with pwrdm " pr_debug("powerdomain: %s: clkdm %s not associated?!\n",
"%s ?!\n", clkdm->name, pwrdm->name); pwrdm->name, clkdm->name);
ret = -ENOENT; ret = -ENOENT;
goto pdc_exit; goto pdc_exit;
} }
...@@ -487,7 +487,7 @@ int pwrdm_set_next_pwrst(struct powerdomain *pwrdm, u8 pwrst) ...@@ -487,7 +487,7 @@ int pwrdm_set_next_pwrst(struct powerdomain *pwrdm, u8 pwrst)
if (!(pwrdm->pwrsts & (1 << pwrst))) if (!(pwrdm->pwrsts & (1 << pwrst)))
return -EINVAL; return -EINVAL;
pr_debug("powerdomain: setting next powerstate for %s to %0x\n", pr_debug("powerdomain: %s: setting next powerstate to %0x\n",
pwrdm->name, pwrst); pwrdm->name, pwrst);
if (arch_pwrdm && arch_pwrdm->pwrdm_set_next_pwrst) { if (arch_pwrdm && arch_pwrdm->pwrdm_set_next_pwrst) {
...@@ -589,7 +589,7 @@ int pwrdm_set_logic_retst(struct powerdomain *pwrdm, u8 pwrst) ...@@ -589,7 +589,7 @@ int pwrdm_set_logic_retst(struct powerdomain *pwrdm, u8 pwrst)
if (!(pwrdm->pwrsts_logic_ret & (1 << pwrst))) if (!(pwrdm->pwrsts_logic_ret & (1 << pwrst)))
return -EINVAL; return -EINVAL;
pr_debug("powerdomain: setting next logic powerstate for %s to %0x\n", pr_debug("powerdomain: %s: setting next logic powerstate to %0x\n",
pwrdm->name, pwrst); pwrdm->name, pwrst);
if (arch_pwrdm && arch_pwrdm->pwrdm_set_logic_retst) if (arch_pwrdm && arch_pwrdm->pwrdm_set_logic_retst)
...@@ -626,8 +626,8 @@ int pwrdm_set_mem_onst(struct powerdomain *pwrdm, u8 bank, u8 pwrst) ...@@ -626,8 +626,8 @@ int pwrdm_set_mem_onst(struct powerdomain *pwrdm, u8 bank, u8 pwrst)
if (!(pwrdm->pwrsts_mem_on[bank] & (1 << pwrst))) if (!(pwrdm->pwrsts_mem_on[bank] & (1 << pwrst)))
return -EINVAL; return -EINVAL;
pr_debug("powerdomain: setting next memory powerstate for domain %s " pr_debug("powerdomain: %s: setting next memory powerstate for bank %0x while pwrdm-ON to %0x\n",
"bank %0x while pwrdm-ON to %0x\n", pwrdm->name, bank, pwrst); pwrdm->name, bank, pwrst);
if (arch_pwrdm && arch_pwrdm->pwrdm_set_mem_onst) if (arch_pwrdm && arch_pwrdm->pwrdm_set_mem_onst)
ret = arch_pwrdm->pwrdm_set_mem_onst(pwrdm, bank, pwrst); ret = arch_pwrdm->pwrdm_set_mem_onst(pwrdm, bank, pwrst);
...@@ -664,8 +664,8 @@ int pwrdm_set_mem_retst(struct powerdomain *pwrdm, u8 bank, u8 pwrst) ...@@ -664,8 +664,8 @@ int pwrdm_set_mem_retst(struct powerdomain *pwrdm, u8 bank, u8 pwrst)
if (!(pwrdm->pwrsts_mem_ret[bank] & (1 << pwrst))) if (!(pwrdm->pwrsts_mem_ret[bank] & (1 << pwrst)))
return -EINVAL; return -EINVAL;
pr_debug("powerdomain: setting next memory powerstate for domain %s " pr_debug("powerdomain: %s: setting next memory powerstate for bank %0x while pwrdm-RET to %0x\n",
"bank %0x while pwrdm-RET to %0x\n", pwrdm->name, bank, pwrst); pwrdm->name, bank, pwrst);
if (arch_pwrdm && arch_pwrdm->pwrdm_set_mem_retst) if (arch_pwrdm && arch_pwrdm->pwrdm_set_mem_retst)
ret = arch_pwrdm->pwrdm_set_mem_retst(pwrdm, bank, pwrst); ret = arch_pwrdm->pwrdm_set_mem_retst(pwrdm, bank, pwrst);
...@@ -843,7 +843,7 @@ int pwrdm_clear_all_prev_pwrst(struct powerdomain *pwrdm) ...@@ -843,7 +843,7 @@ int pwrdm_clear_all_prev_pwrst(struct powerdomain *pwrdm)
* warn & fail if it is not ON. * warn & fail if it is not ON.
*/ */
pr_debug("powerdomain: clearing previous power state reg for %s\n", pr_debug("powerdomain: %s: clearing previous power state reg\n",
pwrdm->name); pwrdm->name);
if (arch_pwrdm && arch_pwrdm->pwrdm_clear_all_prev_pwrst) if (arch_pwrdm && arch_pwrdm->pwrdm_clear_all_prev_pwrst)
...@@ -873,8 +873,7 @@ int pwrdm_enable_hdwr_sar(struct powerdomain *pwrdm) ...@@ -873,8 +873,7 @@ int pwrdm_enable_hdwr_sar(struct powerdomain *pwrdm)
if (!(pwrdm->flags & PWRDM_HAS_HDWR_SAR)) if (!(pwrdm->flags & PWRDM_HAS_HDWR_SAR))
return ret; return ret;
pr_debug("powerdomain: %s: setting SAVEANDRESTORE bit\n", pr_debug("powerdomain: %s: setting SAVEANDRESTORE bit\n", pwrdm->name);
pwrdm->name);
if (arch_pwrdm && arch_pwrdm->pwrdm_enable_hdwr_sar) if (arch_pwrdm && arch_pwrdm->pwrdm_enable_hdwr_sar)
ret = arch_pwrdm->pwrdm_enable_hdwr_sar(pwrdm); ret = arch_pwrdm->pwrdm_enable_hdwr_sar(pwrdm);
...@@ -903,8 +902,7 @@ int pwrdm_disable_hdwr_sar(struct powerdomain *pwrdm) ...@@ -903,8 +902,7 @@ int pwrdm_disable_hdwr_sar(struct powerdomain *pwrdm)
if (!(pwrdm->flags & PWRDM_HAS_HDWR_SAR)) if (!(pwrdm->flags & PWRDM_HAS_HDWR_SAR))
return ret; return ret;
pr_debug("powerdomain: %s: clearing SAVEANDRESTORE bit\n", pr_debug("powerdomain: %s: clearing SAVEANDRESTORE bit\n", pwrdm->name);
pwrdm->name);
if (arch_pwrdm && arch_pwrdm->pwrdm_disable_hdwr_sar) if (arch_pwrdm && arch_pwrdm->pwrdm_disable_hdwr_sar)
ret = arch_pwrdm->pwrdm_disable_hdwr_sar(pwrdm); ret = arch_pwrdm->pwrdm_disable_hdwr_sar(pwrdm);
......
...@@ -122,8 +122,8 @@ static int omap2_pwrdm_wait_transition(struct powerdomain *pwrdm) ...@@ -122,8 +122,8 @@ static int omap2_pwrdm_wait_transition(struct powerdomain *pwrdm)
udelay(1); udelay(1);
if (c > PWRDM_TRANSITION_BAILOUT) { if (c > PWRDM_TRANSITION_BAILOUT) {
printk(KERN_ERR "powerdomain: waited too long for " pr_err("powerdomain: %s: waited too long to complete transition\n",
"powerdomain %s to complete transition\n", pwrdm->name); pwrdm->name);
return -EAGAIN; return -EAGAIN;
} }
......
...@@ -198,8 +198,8 @@ static int omap4_pwrdm_wait_transition(struct powerdomain *pwrdm) ...@@ -198,8 +198,8 @@ static int omap4_pwrdm_wait_transition(struct powerdomain *pwrdm)
udelay(1); udelay(1);
if (c > PWRDM_TRANSITION_BAILOUT) { if (c > PWRDM_TRANSITION_BAILOUT) {
printk(KERN_ERR "powerdomain: waited too long for " pr_err("powerdomain: %s: waited too long to complete transition\n",
"powerdomain %s to complete transition\n", pwrdm->name); pwrdm->name);
return -EAGAIN; return -EAGAIN;
} }
......
...@@ -139,11 +139,11 @@ int omap2_cm_wait_idlest(void __iomem *reg, u32 mask, u8 idlest, ...@@ -139,11 +139,11 @@ int omap2_cm_wait_idlest(void __iomem *reg, u32 mask, u8 idlest,
MAX_MODULE_ENABLE_WAIT, i); MAX_MODULE_ENABLE_WAIT, i);
if (i < MAX_MODULE_ENABLE_WAIT) if (i < MAX_MODULE_ENABLE_WAIT)
pr_debug("cm: Module associated with clock %s ready after %d " pr_debug("cm: Module associated with clock %s ready after %d loops\n",
"loops\n", name, i); name, i);
else else
pr_err("cm: Module associated with clock %s didn't enable in " pr_err("cm: Module associated with clock %s didn't enable in %d tries\n",
"%d tries\n", name, MAX_MODULE_ENABLE_WAIT); name, MAX_MODULE_ENABLE_WAIT);
return (i < MAX_MODULE_ENABLE_WAIT) ? 1 : 0; return (i < MAX_MODULE_ENABLE_WAIT) ? 1 : 0;
}; };
......
...@@ -232,9 +232,8 @@ static int __init omap_serial_early_init(void) ...@@ -232,9 +232,8 @@ static int __init omap_serial_early_init(void)
if (console_loglevel >= 10) { if (console_loglevel >= 10) {
uart_debug = true; uart_debug = true;
pr_info("%s used as console in debug mode" pr_info("%s used as console in debug mode: uart%d clocks will not be gated",
" uart%d clocks will not be" uart_name, uart->num);
" gated", uart_name, uart->num);
} }
if (cmdline_find_option("no_console_suspend")) if (cmdline_find_option("no_console_suspend"))
...@@ -319,8 +318,11 @@ void __init omap_serial_init_port(struct omap_board_data *bdata, ...@@ -319,8 +318,11 @@ void __init omap_serial_init_port(struct omap_board_data *bdata,
pdev = omap_device_build(name, uart->num, oh, pdata, pdata_size, pdev = omap_device_build(name, uart->num, oh, pdata, pdata_size,
NULL, 0, false); NULL, 0, false);
WARN(IS_ERR(pdev), "Could not build omap_device for %s: %s.\n", if (IS_ERR(pdev)) {
name, oh->name); WARN(1, "Could not build omap_device for %s: %s.\n", name,
oh->name);
return;
}
if ((console_uart_id == bdata->id) && no_console_suspend) if ((console_uart_id == bdata->id) && no_console_suspend)
omap_device_disable_idle_on_suspend(pdev); omap_device_disable_idle_on_suspend(pdev);
......
...@@ -104,16 +104,15 @@ static int __init sr_dev_init(struct omap_hwmod *oh, void *user) ...@@ -104,16 +104,15 @@ static int __init sr_dev_init(struct omap_hwmod *oh, void *user)
sr_data = kzalloc(sizeof(struct omap_sr_data), GFP_KERNEL); sr_data = kzalloc(sizeof(struct omap_sr_data), GFP_KERNEL);
if (!sr_data) { if (!sr_data) {
pr_err("%s: Unable to allocate memory for %s sr_data.Error!\n", pr_err("%s: Unable to allocate memory for %s sr_data\n",
__func__, oh->name); __func__, oh->name);
return -ENOMEM; return -ENOMEM;
} }
sr_dev_attr = (struct omap_smartreflex_dev_attr *)oh->dev_attr; sr_dev_attr = (struct omap_smartreflex_dev_attr *)oh->dev_attr;
if (!sr_dev_attr || !sr_dev_attr->sensor_voltdm_name) { if (!sr_dev_attr || !sr_dev_attr->sensor_voltdm_name) {
pr_err("%s: No voltage domain specified for %s." pr_err("%s: No voltage domain specified for %s. Cannot initialize\n",
"Cannot initialize\n", __func__, __func__, oh->name);
oh->name);
goto exit; goto exit;
} }
...@@ -131,8 +130,8 @@ static int __init sr_dev_init(struct omap_hwmod *oh, void *user) ...@@ -131,8 +130,8 @@ static int __init sr_dev_init(struct omap_hwmod *oh, void *user)
omap_voltage_get_volttable(sr_data->voltdm, &volt_data); omap_voltage_get_volttable(sr_data->voltdm, &volt_data);
if (!volt_data) { if (!volt_data) {
pr_warning("%s: No Voltage table registered fo VDD%d." pr_err("%s: No Voltage table registered for VDD%d\n",
"Something really wrong\n\n", __func__, i + 1); __func__, i + 1);
goto exit; goto exit;
} }
......
...@@ -213,7 +213,7 @@ static void __init omap2_gp_clockevent_init(int gptimer_id, ...@@ -213,7 +213,7 @@ static void __init omap2_gp_clockevent_init(int gptimer_id,
res = omap_dm_timer_init_one(&clkev, gptimer_id, fck_source); res = omap_dm_timer_init_one(&clkev, gptimer_id, fck_source);
BUG_ON(res); BUG_ON(res);
omap2_gp_timer_irq.dev_id = (void *)&clkev; omap2_gp_timer_irq.dev_id = &clkev;
setup_irq(clkev.irq, &omap2_gp_timer_irq); setup_irq(clkev.irq, &omap2_gp_timer_irq);
__omap_dm_timer_int_enable(&clkev, OMAP_TIMER_INT_OVERFLOW); __omap_dm_timer_int_enable(&clkev, OMAP_TIMER_INT_OVERFLOW);
......
...@@ -115,9 +115,8 @@ int omap_vc_pre_scale(struct voltagedomain *voltdm, ...@@ -115,9 +115,8 @@ int omap_vc_pre_scale(struct voltagedomain *voltdm,
} }
if (!voltdm->pmic->uv_to_vsel) { if (!voltdm->pmic->uv_to_vsel) {
pr_err("%s: PMIC function to convert voltage in uV to" pr_err("%s: PMIC function to convert voltage in uV to vsel not registered. Hence unable to scale voltage for vdd_%s\n",
"vsel not registered. Hence unable to scale voltage" __func__, voltdm->name);
"for vdd_%s\n", __func__, voltdm->name);
return -ENODATA; return -ENODATA;
} }
......
...@@ -195,8 +195,8 @@ struct omap_volt_data *omap_voltage_get_voltdata(struct voltagedomain *voltdm, ...@@ -195,8 +195,8 @@ struct omap_volt_data *omap_voltage_get_voltdata(struct voltagedomain *voltdm,
return &voltdm->volt_data[i]; return &voltdm->volt_data[i];
} }
pr_notice("%s: Unable to match the current voltage with the voltage" pr_notice("%s: Unable to match the current voltage with the voltage table for vdd_%s\n",
"table for vdd_%s\n", __func__, voltdm->name); __func__, voltdm->name);
return ERR_PTR(-ENODATA); return ERR_PTR(-ENODATA);
} }
...@@ -249,8 +249,8 @@ void omap_change_voltscale_method(struct voltagedomain *voltdm, ...@@ -249,8 +249,8 @@ void omap_change_voltscale_method(struct voltagedomain *voltdm,
voltdm->scale = omap_vc_bypass_scale; voltdm->scale = omap_vc_bypass_scale;
return; return;
default: default:
pr_warning("%s: Trying to change the method of voltage scaling" pr_warn("%s: Trying to change the method of voltage scaling to an unsupported one!\n",
"to an unsupported one!\n", __func__); __func__);
} }
} }
...@@ -331,8 +331,8 @@ int voltdm_add_pwrdm(struct voltagedomain *voltdm, struct powerdomain *pwrdm) ...@@ -331,8 +331,8 @@ int voltdm_add_pwrdm(struct voltagedomain *voltdm, struct powerdomain *pwrdm)
if (!voltdm || !pwrdm) if (!voltdm || !pwrdm)
return -EINVAL; return -EINVAL;
pr_debug("voltagedomain: associating powerdomain %s with voltagedomain " pr_debug("voltagedomain: %s: associating powerdomain %s\n",
"%s\n", pwrdm->name, voltdm->name); voltdm->name, pwrdm->name);
list_add(&pwrdm->voltdm_node, &voltdm->pwrdm_list); list_add(&pwrdm->voltdm_node, &voltdm->pwrdm_list);
......
...@@ -138,8 +138,8 @@ int omap_vp_forceupdate_scale(struct voltagedomain *voltdm, ...@@ -138,8 +138,8 @@ int omap_vp_forceupdate_scale(struct voltagedomain *voltdm,
udelay(1); udelay(1);
} }
if (timeout >= VP_TRANXDONE_TIMEOUT) { if (timeout >= VP_TRANXDONE_TIMEOUT) {
pr_warning("%s: vdd_%s TRANXDONE timeout exceeded." pr_warn("%s: vdd_%s TRANXDONE timeout exceeded. Voltage change aborted",
"Voltage change aborted", __func__, voltdm->name); __func__, voltdm->name);
return -ETIMEDOUT; return -ETIMEDOUT;
} }
...@@ -157,9 +157,8 @@ int omap_vp_forceupdate_scale(struct voltagedomain *voltdm, ...@@ -157,9 +157,8 @@ int omap_vp_forceupdate_scale(struct voltagedomain *voltdm,
omap_test_timeout(vp->common->ops->check_txdone(vp->id), omap_test_timeout(vp->common->ops->check_txdone(vp->id),
VP_TRANXDONE_TIMEOUT, timeout); VP_TRANXDONE_TIMEOUT, timeout);
if (timeout >= VP_TRANXDONE_TIMEOUT) if (timeout >= VP_TRANXDONE_TIMEOUT)
pr_err("%s: vdd_%s TRANXDONE timeout exceeded." pr_err("%s: vdd_%s TRANXDONE timeout exceeded. TRANXDONE never got set after the voltage update\n",
"TRANXDONE never got set after the voltage update\n", __func__, voltdm->name);
__func__, voltdm->name);
omap_vc_post_scale(voltdm, target_volt, target_vsel, current_vsel); omap_vc_post_scale(voltdm, target_volt, target_vsel, current_vsel);
...@@ -176,8 +175,7 @@ int omap_vp_forceupdate_scale(struct voltagedomain *voltdm, ...@@ -176,8 +175,7 @@ int omap_vp_forceupdate_scale(struct voltagedomain *voltdm,
} }
if (timeout >= VP_TRANXDONE_TIMEOUT) if (timeout >= VP_TRANXDONE_TIMEOUT)
pr_warning("%s: vdd_%s TRANXDONE timeout exceeded while trying" pr_warn("%s: vdd_%s TRANXDONE timeout exceeded while trying to clear the TRANXDONE status\n",
"to clear the TRANXDONE status\n",
__func__, voltdm->name); __func__, voltdm->name);
/* Clear force bit */ /* Clear force bit */
...@@ -257,8 +255,8 @@ void omap_vp_disable(struct voltagedomain *voltdm) ...@@ -257,8 +255,8 @@ void omap_vp_disable(struct voltagedomain *voltdm)
/* If VP is already disabled, do nothing. Return */ /* If VP is already disabled, do nothing. Return */
if (!vp->enabled) { if (!vp->enabled) {
pr_warning("%s: Trying to disable VP for vdd_%s when" pr_warn("%s: Trying to disable VP for vdd_%s when it is already disabled\n",
"it is already disabled\n", __func__, voltdm->name); __func__, voltdm->name);
return; return;
} }
......
...@@ -968,8 +968,7 @@ void omap_stop_dma(int lch) ...@@ -968,8 +968,7 @@ void omap_stop_dma(int lch)
l = p->dma_read(CCR, lch); l = p->dma_read(CCR, lch);
} }
if (i >= 100) if (i >= 100)
printk(KERN_ERR "DMA drain did not complete on " pr_err("DMA drain did not complete on lch %d\n", lch);
"lch %d\n", lch);
/* Restore OCP_SYSCONFIG */ /* Restore OCP_SYSCONFIG */
p->dma_write(sys_cf, OCP_SYSCONFIG, lch); p->dma_write(sys_cf, OCP_SYSCONFIG, lch);
} else { } else {
...@@ -1153,8 +1152,7 @@ void omap_dma_link_lch(int lch_head, int lch_queue) ...@@ -1153,8 +1152,7 @@ void omap_dma_link_lch(int lch_head, int lch_queue)
if ((dma_chan[lch_head].dev_id == -1) || if ((dma_chan[lch_head].dev_id == -1) ||
(dma_chan[lch_queue].dev_id == -1)) { (dma_chan[lch_queue].dev_id == -1)) {
printk(KERN_ERR "omap_dma: trying to link " pr_err("omap_dma: trying to link non requested channels\n");
"non requested channels\n");
dump_stack(); dump_stack();
} }
...@@ -1180,15 +1178,13 @@ void omap_dma_unlink_lch(int lch_head, int lch_queue) ...@@ -1180,15 +1178,13 @@ void omap_dma_unlink_lch(int lch_head, int lch_queue)
if (dma_chan[lch_head].next_lch != lch_queue || if (dma_chan[lch_head].next_lch != lch_queue ||
dma_chan[lch_head].next_lch == -1) { dma_chan[lch_head].next_lch == -1) {
printk(KERN_ERR "omap_dma: trying to unlink " pr_err("omap_dma: trying to unlink non linked channels\n");
"non linked channels\n");
dump_stack(); dump_stack();
} }
if ((dma_chan[lch_head].flags & OMAP_DMA_ACTIVE) || if ((dma_chan[lch_head].flags & OMAP_DMA_ACTIVE) ||
(dma_chan[lch_queue].flags & OMAP_DMA_ACTIVE)) { (dma_chan[lch_queue].flags & OMAP_DMA_ACTIVE)) {
printk(KERN_ERR "omap_dma: You need to stop the DMA channels " pr_err("omap_dma: You need to stop the DMA channels before unlinking\n");
"before unlinking\n");
dump_stack(); dump_stack();
} }
...@@ -1830,16 +1826,15 @@ static int omap1_dma_handle_ch(int ch) ...@@ -1830,16 +1826,15 @@ static int omap1_dma_handle_ch(int ch)
if ((csr & 0x3f) == 0) if ((csr & 0x3f) == 0)
return 0; return 0;
if (unlikely(dma_chan[ch].dev_id == -1)) { if (unlikely(dma_chan[ch].dev_id == -1)) {
printk(KERN_WARNING "Spurious interrupt from DMA channel " pr_warn("Spurious interrupt from DMA channel %d (CSR %04x)\n",
"%d (CSR %04x)\n", ch, csr); ch, csr);
return 0; return 0;
} }
if (unlikely(csr & OMAP1_DMA_TOUT_IRQ)) if (unlikely(csr & OMAP1_DMA_TOUT_IRQ))
printk(KERN_WARNING "DMA timeout with device %d\n", pr_warn("DMA timeout with device %d\n", dma_chan[ch].dev_id);
dma_chan[ch].dev_id);
if (unlikely(csr & OMAP_DMA_DROP_IRQ)) if (unlikely(csr & OMAP_DMA_DROP_IRQ))
printk(KERN_WARNING "DMA synchronization event drop occurred " pr_warn("DMA synchronization event drop occurred with device %d\n",
"with device %d\n", dma_chan[ch].dev_id); dma_chan[ch].dev_id);
if (likely(csr & OMAP_DMA_BLOCK_IRQ)) if (likely(csr & OMAP_DMA_BLOCK_IRQ))
dma_chan[ch].flags &= ~OMAP_DMA_ACTIVE; dma_chan[ch].flags &= ~OMAP_DMA_ACTIVE;
if (likely(dma_chan[ch].callback != NULL)) if (likely(dma_chan[ch].callback != NULL))
...@@ -1879,21 +1874,19 @@ static int omap2_dma_handle_ch(int ch) ...@@ -1879,21 +1874,19 @@ static int omap2_dma_handle_ch(int ch)
if (!status) { if (!status) {
if (printk_ratelimit()) if (printk_ratelimit())
printk(KERN_WARNING "Spurious DMA IRQ for lch %d\n", pr_warn("Spurious DMA IRQ for lch %d\n", ch);
ch);
p->dma_write(1 << ch, IRQSTATUS_L0, ch); p->dma_write(1 << ch, IRQSTATUS_L0, ch);
return 0; return 0;
} }
if (unlikely(dma_chan[ch].dev_id == -1)) { if (unlikely(dma_chan[ch].dev_id == -1)) {
if (printk_ratelimit()) if (printk_ratelimit())
printk(KERN_WARNING "IRQ %04x for non-allocated DMA" pr_warn("IRQ %04x for non-allocated DMA channel %d\n",
"channel %d\n", status, ch); status, ch);
return 0; return 0;
} }
if (unlikely(status & OMAP_DMA_DROP_IRQ)) if (unlikely(status & OMAP_DMA_DROP_IRQ))
printk(KERN_INFO pr_info("DMA synchronization event drop occurred with device %d\n",
"DMA synchronization event drop occurred with device " dma_chan[ch].dev_id);
"%d\n", dma_chan[ch].dev_id);
if (unlikely(status & OMAP2_DMA_TRANS_ERR_IRQ)) { if (unlikely(status & OMAP2_DMA_TRANS_ERR_IRQ)) {
printk(KERN_INFO "DMA transaction error with device %d\n", printk(KERN_INFO "DMA transaction error with device %d\n",
dma_chan[ch].dev_id); dma_chan[ch].dev_id);
...@@ -2013,8 +2006,9 @@ static int __devinit omap_system_dma_probe(struct platform_device *pdev) ...@@ -2013,8 +2006,9 @@ static int __devinit omap_system_dma_probe(struct platform_device *pdev)
p = pdev->dev.platform_data; p = pdev->dev.platform_data;
if (!p) { if (!p) {
dev_err(&pdev->dev, "%s: System DMA initialized without" dev_err(&pdev->dev,
"platform data\n", __func__); "%s: System DMA initialized without platform data\n",
__func__);
return -EINVAL; return -EINVAL;
} }
...@@ -2089,8 +2083,8 @@ static int __devinit omap_system_dma_probe(struct platform_device *pdev) ...@@ -2089,8 +2083,8 @@ static int __devinit omap_system_dma_probe(struct platform_device *pdev)
} }
ret = setup_irq(dma_irq, &omap24xx_dma_irq); ret = setup_irq(dma_irq, &omap24xx_dma_irq);
if (ret) { if (ret) {
dev_err(&pdev->dev, "set_up failed for IRQ %d" dev_err(&pdev->dev, "set_up failed for IRQ %d for DMA (error %d)\n",
"for DMA (error %d)\n", dma_irq, ret); dma_irq, ret);
goto exit_dma_lch_fail; goto exit_dma_lch_fail;
} }
} }
...@@ -2098,8 +2092,7 @@ static int __devinit omap_system_dma_probe(struct platform_device *pdev) ...@@ -2098,8 +2092,7 @@ static int __devinit omap_system_dma_probe(struct platform_device *pdev)
/* reserve dma channels 0 and 1 in high security devices */ /* reserve dma channels 0 and 1 in high security devices */
if (cpu_is_omap34xx() && if (cpu_is_omap34xx() &&
(omap_type() != OMAP2_DEVICE_TYPE_GP)) { (omap_type() != OMAP2_DEVICE_TYPE_GP)) {
printk(KERN_INFO "Reserving DMA channels 0 and 1 for " pr_info("Reserving DMA channels 0 and 1 for HS ROM code\n");
"HS ROM code\n");
dma_chan[0].dev_id = 0; dma_chan[0].dev_id = 0;
dma_chan[1].dev_id = 1; dma_chan[1].dev_id = 1;
} }
...@@ -2107,8 +2100,8 @@ static int __devinit omap_system_dma_probe(struct platform_device *pdev) ...@@ -2107,8 +2100,8 @@ static int __devinit omap_system_dma_probe(struct platform_device *pdev)
return 0; return 0;
exit_dma_irq_fail: exit_dma_irq_fail:
dev_err(&pdev->dev, "unable to request IRQ %d" dev_err(&pdev->dev, "unable to request IRQ %d for DMA (error %d)\n",
"for DMA (error %d)\n", dma_irq, ret); dma_irq, ret);
for (irq_rel = 0; irq_rel < ch; irq_rel++) { for (irq_rel = 0; irq_rel < ch; irq_rel++) {
dma_irq = platform_get_irq(pdev, irq_rel); dma_irq = platform_get_irq(pdev, irq_rel);
free_irq(dma_irq, (void *)(irq_rel + 1)); free_irq(dma_irq, (void *)(irq_rel + 1));
......
...@@ -76,7 +76,7 @@ int __init_or_module omap_cfg_reg(const unsigned long index) ...@@ -76,7 +76,7 @@ int __init_or_module omap_cfg_reg(const unsigned long index)
return -ENODEV; return -ENODEV;
} }
reg = (struct pin_config *)&mux_cfg->pins[index]; reg = &mux_cfg->pins[index];
if (!mux_cfg->cfg_reg) if (!mux_cfg->cfg_reg)
return -ENODEV; return -ENODEV;
......
...@@ -41,11 +41,11 @@ int omap_pm_set_max_mpu_wakeup_lat(struct device *dev, long t) ...@@ -41,11 +41,11 @@ int omap_pm_set_max_mpu_wakeup_lat(struct device *dev, long t)
}; };
if (t == -1) if (t == -1)
pr_debug("OMAP PM: remove max MPU wakeup latency constraint: " pr_debug("OMAP PM: remove max MPU wakeup latency constraint: dev %s\n",
"dev %s\n", dev_name(dev)); dev_name(dev));
else else
pr_debug("OMAP PM: add max MPU wakeup latency constraint: " pr_debug("OMAP PM: add max MPU wakeup latency constraint: dev %s, t = %ld usec\n",
"dev %s, t = %ld usec\n", dev_name(dev), t); dev_name(dev), t);
/* /*
* For current Linux, this needs to map the MPU to a * For current Linux, this needs to map the MPU to a
...@@ -70,11 +70,10 @@ int omap_pm_set_min_bus_tput(struct device *dev, u8 agent_id, unsigned long r) ...@@ -70,11 +70,10 @@ int omap_pm_set_min_bus_tput(struct device *dev, u8 agent_id, unsigned long r)
}; };
if (r == 0) if (r == 0)
pr_debug("OMAP PM: remove min bus tput constraint: " pr_debug("OMAP PM: remove min bus tput constraint: dev %s for agent_id %d\n",
"dev %s for agent_id %d\n", dev_name(dev), agent_id); dev_name(dev), agent_id);
else else
pr_debug("OMAP PM: add min bus tput constraint: " pr_debug("OMAP PM: add min bus tput constraint: dev %s for agent_id %d: rate %ld KiB\n",
"dev %s for agent_id %d: rate %ld KiB\n",
dev_name(dev), agent_id, r); dev_name(dev), agent_id, r);
/* /*
...@@ -97,11 +96,11 @@ int omap_pm_set_max_dev_wakeup_lat(struct device *req_dev, struct device *dev, ...@@ -97,11 +96,11 @@ int omap_pm_set_max_dev_wakeup_lat(struct device *req_dev, struct device *dev,
}; };
if (t == -1) if (t == -1)
pr_debug("OMAP PM: remove max device latency constraint: " pr_debug("OMAP PM: remove max device latency constraint: dev %s\n",
"dev %s\n", dev_name(dev)); dev_name(dev));
else else
pr_debug("OMAP PM: add max device latency constraint: " pr_debug("OMAP PM: add max device latency constraint: dev %s, t = %ld usec\n",
"dev %s, t = %ld usec\n", dev_name(dev), t); dev_name(dev), t);
/* /*
* For current Linux, this needs to map the device to a * For current Linux, this needs to map the device to a
...@@ -127,11 +126,11 @@ int omap_pm_set_max_sdma_lat(struct device *dev, long t) ...@@ -127,11 +126,11 @@ int omap_pm_set_max_sdma_lat(struct device *dev, long t)
}; };
if (t == -1) if (t == -1)
pr_debug("OMAP PM: remove max DMA latency constraint: " pr_debug("OMAP PM: remove max DMA latency constraint: dev %s\n",
"dev %s\n", dev_name(dev)); dev_name(dev));
else else
pr_debug("OMAP PM: add max DMA latency constraint: " pr_debug("OMAP PM: add max DMA latency constraint: dev %s, t = %ld usec\n",
"dev %s, t = %ld usec\n", dev_name(dev), t); dev_name(dev), t);
/* /*
* For current Linux PM QOS params, this code should scan the * For current Linux PM QOS params, this code should scan the
...@@ -156,11 +155,11 @@ int omap_pm_set_min_clk_rate(struct device *dev, struct clk *c, long r) ...@@ -156,11 +155,11 @@ int omap_pm_set_min_clk_rate(struct device *dev, struct clk *c, long r)
} }
if (r == 0) if (r == 0)
pr_debug("OMAP PM: remove min clk rate constraint: " pr_debug("OMAP PM: remove min clk rate constraint: dev %s\n",
"dev %s\n", dev_name(dev)); dev_name(dev));
else else
pr_debug("OMAP PM: add min clk rate constraint: " pr_debug("OMAP PM: add min clk rate constraint: dev %s, rate = %ld Hz\n",
"dev %s, rate = %ld Hz\n", dev_name(dev), r); dev_name(dev), r);
/* /*
* Code in a real implementation should keep track of these * Code in a real implementation should keep track of these
......
/* /*
* omap_device implementation * omap_device implementation
* *
...@@ -153,21 +152,19 @@ static int _omap_device_activate(struct omap_device *od, u8 ignore_lat) ...@@ -153,21 +152,19 @@ static int _omap_device_activate(struct omap_device *od, u8 ignore_lat)
act_lat = timespec_to_ns(&c); act_lat = timespec_to_ns(&c);
dev_dbg(&od->pdev->dev, dev_dbg(&od->pdev->dev,
"omap_device: pm_lat %d: activate: elapsed time " "omap_device: pm_lat %d: activate: elapsed time %llu nsec\n",
"%llu nsec\n", od->pm_lat_level, act_lat); od->pm_lat_level, act_lat);
if (act_lat > odpl->activate_lat) { if (act_lat > odpl->activate_lat) {
odpl->activate_lat_worst = act_lat; odpl->activate_lat_worst = act_lat;
if (odpl->flags & OMAP_DEVICE_LATENCY_AUTO_ADJUST) { if (odpl->flags & OMAP_DEVICE_LATENCY_AUTO_ADJUST) {
odpl->activate_lat = act_lat; odpl->activate_lat = act_lat;
dev_dbg(&od->pdev->dev, dev_dbg(&od->pdev->dev,
"new worst case activate latency " "new worst case activate latency %d: %llu\n",
"%d: %llu\n",
od->pm_lat_level, act_lat); od->pm_lat_level, act_lat);
} else } else
dev_warn(&od->pdev->dev, dev_warn(&od->pdev->dev,
"activate latency %d " "activate latency %d higher than expected. (%llu > %d)\n",
"higher than exptected. (%llu > %d)\n",
od->pm_lat_level, act_lat, od->pm_lat_level, act_lat,
odpl->activate_lat); odpl->activate_lat);
} }
...@@ -220,21 +217,19 @@ static int _omap_device_deactivate(struct omap_device *od, u8 ignore_lat) ...@@ -220,21 +217,19 @@ static int _omap_device_deactivate(struct omap_device *od, u8 ignore_lat)
deact_lat = timespec_to_ns(&c); deact_lat = timespec_to_ns(&c);
dev_dbg(&od->pdev->dev, dev_dbg(&od->pdev->dev,
"omap_device: pm_lat %d: deactivate: elapsed time " "omap_device: pm_lat %d: deactivate: elapsed time %llu nsec\n",
"%llu nsec\n", od->pm_lat_level, deact_lat); od->pm_lat_level, deact_lat);
if (deact_lat > odpl->deactivate_lat) { if (deact_lat > odpl->deactivate_lat) {
odpl->deactivate_lat_worst = deact_lat; odpl->deactivate_lat_worst = deact_lat;
if (odpl->flags & OMAP_DEVICE_LATENCY_AUTO_ADJUST) { if (odpl->flags & OMAP_DEVICE_LATENCY_AUTO_ADJUST) {
odpl->deactivate_lat = deact_lat; odpl->deactivate_lat = deact_lat;
dev_dbg(&od->pdev->dev, dev_dbg(&od->pdev->dev,
"new worst case deactivate latency " "new worst case deactivate latency %d: %llu\n",
"%d: %llu\n",
od->pm_lat_level, deact_lat); od->pm_lat_level, deact_lat);
} else } else
dev_warn(&od->pdev->dev, dev_warn(&od->pdev->dev,
"deactivate latency %d " "deactivate latency %d higher than expected. (%llu > %d)\n",
"higher than exptected. (%llu > %d)\n",
od->pm_lat_level, deact_lat, od->pm_lat_level, deact_lat,
odpl->deactivate_lat); odpl->deactivate_lat);
} }
...@@ -449,8 +444,8 @@ static int omap_device_count_resources(struct omap_device *od) ...@@ -449,8 +444,8 @@ static int omap_device_count_resources(struct omap_device *od)
for (i = 0; i < od->hwmods_cnt; i++) for (i = 0; i < od->hwmods_cnt; i++)
c += omap_hwmod_count_resources(od->hwmods[i]); c += omap_hwmod_count_resources(od->hwmods[i]);
pr_debug("omap_device: %s: counted %d total resources across %d " pr_debug("omap_device: %s: counted %d total resources across %d hwmods\n",
"hwmods\n", od->pdev->name, c, od->hwmods_cnt); od->pdev->name, c, od->hwmods_cnt);
return c; return c;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment