Re: [PATCH 038/120] MIPS: PS2: ROM: Read data for a given ROM file name

[Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>]

Hello!

On 09/02/2019 12:05 PM, Sergei Shtylyov wrote:

>> Reading ROM files is trivial since they are permanently available in
>> memory. Having rom_read_file() is a convenient when for example
>> resolving the machine region in subsequent changes.
>>
>> Signed-off-by: Fredrik Noring <noring@nocrew.org>
> [...]
>> index 12a57f24bd63..840d37a199d8 100644
>> --- a/arch/mips/ps2/rom.c
>> +++ b/arch/mips/ps2/rom.c
>> @@ -224,6 +224,39 @@ struct rom_file rom_first_file(const struct rom_dir dir)
>>   }
>>   EXPORT_SYMBOL_GPL(rom_first_file);
>>   +/**
>> + * rom_read_file - read ROM file data
>> + * @dir: directory to read the file from
>> + * @name: file name to read
>> + * @buffer: pointer to buffer to store data that is read
>> + * @size: size in bytes to read
>> + * @offset: offset in bytes to start reading
>> + *
>> + * Context: any
>> + * Return: on successful completion, a nonnegative integer indicating the
>> + *     number of bytes actually read; otherwise, a negative error number
>> + */
>> +ssize_t rom_read_file(const struct rom_dir dir,
>> +    const char *name, void *buffer, size_t size, loff_t offset)
>> +{
>> +    struct rom_file file;
>> +
>> +    rom_find_files(file, dir, name)
>> +        if (offset < file.size) {
>> +            const u8 *b = file.data;
>> +            size_t remaining = file.size - offset;
>> +            size_t n = min(size, remaining);
>> +
>> +            memcpy(buffer, &b[offset], n);
>> +
>> +            return n;
>> +        } else
> 
>    The *else* branch also needs {} if the *if* branch has 'emn, according to Documentation/process/coding-style.rst.

   Just realized that we don't need *else* after *return*...

>> +            return 0;
>> +
>> +    return -ENOENT;
>> +}
>> +EXPORT_SYMBOL_GPL(rom_read_file);
>> +
>>   /**
>>    * find_reset_string - find the offset to the ``"RESET"`` string, if it exists
>>    * @rom: ROM to search in

MBR, Sergei