microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

memory: brcmstb: dpfe: move init_data into brcmstb_dpfe_download_firmware() 

Rather than declaring our init_data in several places and passing it as
parameter into brcmstb_dpfe_download_firmware(), we declare it inside
brcmstb_dpfe_download_firmware() instead.

Signed-off-by: Markus Mayer <mmayer@broadcom.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
This commit is contained in:
Markus Mayer 2019-10-15 15:45:09 -07:00 коммит произвёл Florian Fainelli
Родитель 75d316e763
Коммит 6ef972b192
1 изменённых файлов: 9 добавлений и 12 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

21
drivers/memory/brcmstb_dpfe.c
Просмотреть файл

@ -582,8 +582,7 @@ static int __write_firmware(u32 __iomem *mem, const u32 *fw,
return 0; return 0;
} }
static int brcmstb_dpfe_download_firmware(struct platform_device *pdev, static int brcmstb_dpfe_download_firmware(struct platform_device *pdev)
struct init_data *init)
{ {
const struct dpfe_firmware_header *header; const struct dpfe_firmware_header *header;
unsigned int dmem_size, imem_size; unsigned int dmem_size, imem_size;
@ -592,6 +591,7 @@ static int brcmstb_dpfe_download_firmware(struct platform_device *pdev,
struct brcmstb_dpfe_priv *priv; struct brcmstb_dpfe_priv *priv;
const struct firmware *fw; const struct firmware *fw;
const u32 *dmem, *imem; const u32 *dmem, *imem;
struct init_data init;
const void *fw_blob; const void *fw_blob;
int ret; int ret;
@ -622,15 +622,15 @@ static int brcmstb_dpfe_download_firmware(struct platform_device *pdev,
if (ret) if (ret)
return ret; return ret;
ret = __verify_firmware(init, fw); ret = __verify_firmware(&init, fw);
if (ret) if (ret)
return -EFAULT; return -EFAULT;
__disable_dcpu(priv); __disable_dcpu(priv);
is_big_endian = init->is_big_endian; is_big_endian = init.is_big_endian;
dmem_size = init->dmem_len; dmem_size = init.dmem_len;
imem_size = init->imem_len; imem_size = init.imem_len;
/* At the beginning of the firmware blob is a header. */ /* At the beginning of the firmware blob is a header. */
header = (struct dpfe_firmware_header *)fw->data; header = (struct dpfe_firmware_header *)fw->data;
@ -648,7 +648,7 @@ static int brcmstb_dpfe_download_firmware(struct platform_device *pdev,
if (ret) if (ret)
return ret; return ret;
ret = __verify_fw_checksum(init, priv, header, init->chksum); ret = __verify_fw_checksum(&init, priv, header, init.chksum);
if (ret) if (ret)
return ret; return ret;
@ -811,16 +811,13 @@ static ssize_t show_dram(struct device *dev, struct device_attribute *devattr,
static int brcmstb_dpfe_resume(struct platform_device *pdev) static int brcmstb_dpfe_resume(struct platform_device *pdev)
{ {
struct init_data init; return brcmstb_dpfe_download_firmware(pdev);
return brcmstb_dpfe_download_firmware(pdev, &init);
} }
static int brcmstb_dpfe_probe(struct platform_device *pdev) static int brcmstb_dpfe_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
struct brcmstb_dpfe_priv *priv; struct brcmstb_dpfe_priv *priv;
struct init_data init;
struct resource *res; struct resource *res;
int ret; int ret;
@ -864,7 +861,7 @@ static int brcmstb_dpfe_probe(struct platform_device *pdev)
return -ENOENT; return -ENOENT;
} }
ret = brcmstb_dpfe_download_firmware(pdev, &init); ret = brcmstb_dpfe_download_firmware(pdev);
if (ret) { if (ret) {
dev_err(dev, "Couldn't download firmware -- %d\n", ret); dev_err(dev, "Couldn't download firmware -- %d\n", ret);
return ret; return ret;