summaryrefslogtreecommitdiff
path: root/include/linux/firmware.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/firmware.h')
-rw-r--r--include/linux/firmware.h19
1 files changed, 11 insertions, 8 deletions
diff --git a/include/linux/firmware.h b/include/linux/firmware.h
index bb31b5ad09f7..7a49a0976f06 100644
--- a/include/linux/firmware.h
+++ b/include/linux/firmware.h
@@ -51,15 +51,16 @@ int request_firmware_direct(const struct firmware **fw, const char *name,
int request_firmware_into_buf(const char *name, struct device *device,
phys_addr_t dest_addr, size_t dest_size,
void * (*map_fw_mem)(phys_addr_t phys,
- size_t size),
- void (*unmap_fw_mem)(void *virt));
+ size_t size, void *data),
+ void (*unmap_fw_mem)(void *virt, void *data),
+ void *data);
int request_firmware_nowait_into_buf(
struct module *module, bool uevent,
const char *name, struct device *device, gfp_t gfp, void *context,
void (*cont)(const struct firmware *fw, void *context),
phys_addr_t dest_addr, size_t dest_size,
- void * (*map_fw_mem)(phys_addr_t phys, size_t size),
- void (*unmap_fw_mem)(void *virt));
+ void * (*map_fw_mem)(phys_addr_t phys, size_t size, void *data),
+ void (*unmap_fw_mem)(void *virt, void *data), void *data);
void release_firmware(const struct firmware *fw);
#else
static inline int request_firmware(const struct firmware **fw,
@@ -73,8 +74,10 @@ static inline int request_firmware_into_buf(const char *name,
phys_addr_t dest_addr,
size_t dest_size,
void * (*map_fw_mem)(phys_addr_t phys,
- size_t size),
- void (*unmap_fw_mem)(void *virt))
+ size_t size, void *data),
+ void (*unmap_fw_mem)(void *virt,
+ void *data),
+ void *data)
{
return -EINVAL;
}
@@ -90,8 +93,8 @@ static inline int request_firmware_nowait_into_buf(
const char *name, struct device *device, gfp_t gfp, void *context,
void (*cont)(const struct firmware *fw, void *context),
phys_addr_t dest_addr, size_t dest_size,
- void * (*map_fw_mem)(phys_addr_t phys, size_t size),
- void (*unmap_fw_mem)(void *virt))
+ void * (*map_fw_mem)(phys_addr_t phys, size_t size, void *data),
+ void (*unmap_fw_mem)(void *virt, void *data), void *data)
{
return -EINVAL;
}