On Mon, 8 Oct 2007, Geoff Levand wrote:
> o Add a KERN_WARNING message when flash driver is not available.
> --- a/arch/powerpc/platforms/ps3/os-area.c
> +++ b/arch/powerpc/platforms/ps3/os-area.c
> +static void update_flash_db(void)
> +{
> + int result;
> + int file;
> + off_t offset;
> + ssize_t count;
> + static const unsigned int buf_len = 8 * OS_AREA_SEGMENT_SIZE;
> + const struct os_area_header *header;
> + struct os_area_db* db;
> +
> + /* Read in header and db from flash. */
> +
> + file = sys_open("/dev/ps3flash", O_RDWR, 0);
> +
> + if (file < 0) {
> + pr_debug("%s:%d sys_open failed\n", __func__, __LINE__);
^^^^^^^^
pr_warn?
If the ps3flash module is not loaded, you want to see the warning.
> @@ -264,6 +664,12 @@ static void os_area_queue_work_handler(s
> pr_debug("%s:%d of_find_node_by_path failed\n",
> __func__, __LINE__);
>
> +#if defined(CONFIG_PS3_FLASH) || defined(CONFIG_PS3_FLASH_MODULE)
> + update_flash_db();
> +#else
> + printk(KERN_WARNING "%s:%d: No flash rom driver configured.\n",
> + __func__, __LINE__);
> +#endif
> pr_debug(" <- %s:%d\n", __func__, __LINE__);
> }
Alternatively:
#if defined(CONFIG_PS3_FLASH) || defined(CONFIG_PS3_FLASH_MODULE)
static int update_flash_db(void)
{
...
return error;
}
#else
static inline int update_flash_db(void)
{
return -Exxx;
}
#endif
if (update_flash_db())
printk(KERN_WARNING ...);
With kind regards,
Geert Uytterhoeven
Software Architect
Sony Network and Software Technology Center Europe
The Corporate Village · Da Vincilaan 7-D1 · B-1935 Zaventem · Belgium
Phone: +32 (0)2 700 8453
Fax: +32 (0)2 700 8622
E-mail: [EMAIL PROTECTED]
Internet: http://www.sony-europe.com/
Sony Network and Software Technology Center Europe
A division of Sony Service Centre (Europe) N.V.
Registered office: Technologielaan 7 · B-1840 Londerzeel · Belgium
VAT BE 0413.825.160 · RPR Brussels
Fortis Bank Zaventem · Swift GEBABEBB08A · IBAN BE39001382358619_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev@ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev
