|
@@ -65,15 +65,15 @@ static int download_image(struct sdio_func *func, const char *img_name)
|
|
|
|
|
|
ret = request_firmware(&firm, img_name, &func->dev);
|
|
|
if (ret < 0) {
|
|
|
- printk(KERN_ERR
|
|
|
- "requesting firmware %s failed with error %d\n",
|
|
|
+ dev_err(&func->dev,
|
|
|
+ "requesting firmware %s failed with error %d\n",
|
|
|
img_name, ret);
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
buf = kmalloc(DOWNLOAD_SIZE + TYPE_A_HEADER_SIZE, GFP_KERNEL);
|
|
|
if (buf == NULL) {
|
|
|
- printk(KERN_ERR "Error: kmalloc\n");
|
|
|
+ dev_err(&func->dev, "Error: kmalloc\n");
|
|
|
return -ENOMEM;
|
|
|
}
|
|
|
|
|
@@ -101,8 +101,9 @@ static int download_image(struct sdio_func *func, const char *img_name)
|
|
|
memcpy(buf+TYPE_A_HEADER_SIZE, firm->data + pos, len);
|
|
|
ret = sdio_memcpy_toio(func, 0, buf, len + TYPE_A_HEADER_SIZE);
|
|
|
if (ret < 0) {
|
|
|
- printk(KERN_ERR "gdmwm: send image error: "
|
|
|
- "packet number = %d ret = %d\n", pno, ret);
|
|
|
+ dev_err(&func->dev,
|
|
|
+ "send image error: packet number = %d ret = %d\n",
|
|
|
+ pno, ret);
|
|
|
goto out;
|
|
|
}
|
|
|
|
|
@@ -110,13 +111,14 @@ static int download_image(struct sdio_func *func, const char *img_name)
|
|
|
break;
|
|
|
if (!ack_ready(func)) {
|
|
|
ret = -EIO;
|
|
|
- printk(KERN_ERR "gdmwm: Ack is not ready.\n");
|
|
|
+ dev_err(&func->dev, "Ack is not ready.\n");
|
|
|
goto out;
|
|
|
}
|
|
|
ret = sdio_memcpy_fromio(func, buf, 0, TYPE_A_LOOKAHEAD_SIZE);
|
|
|
if (ret < 0) {
|
|
|
- printk(KERN_ERR "gdmwm: receive ack error: "
|
|
|
- "packet number = %d ret = %d\n", pno, ret);
|
|
|
+ dev_err(&func->dev,
|
|
|
+ "receive ack error: packet number = %d ret = %d\n",
|
|
|
+ pno, ret);
|
|
|
goto out;
|
|
|
}
|
|
|
sdio_writeb(func, 0x01, 0x13, &ret);
|
|
@@ -140,19 +142,20 @@ int sdio_boot(struct sdio_func *func)
|
|
|
|
|
|
tx_buf = kmalloc(YMEM0_SIZE, GFP_KERNEL);
|
|
|
if (tx_buf == NULL) {
|
|
|
- printk(KERN_ERR "Error: kmalloc: %s %d\n", __func__, __LINE__);
|
|
|
+ dev_err(&func->dev, "Error: kmalloc: %s %d\n",
|
|
|
+ __func__, __LINE__);
|
|
|
return -ENOMEM;
|
|
|
}
|
|
|
|
|
|
ret = download_image(func, krn_name);
|
|
|
if (ret)
|
|
|
goto restore_fs;
|
|
|
- printk(KERN_INFO "GCT: Kernel download success.\n");
|
|
|
+ dev_info(&func->dev, "GCT: Kernel download success.\n");
|
|
|
|
|
|
ret = download_image(func, rfs_name);
|
|
|
if (ret)
|
|
|
goto restore_fs;
|
|
|
- printk(KERN_INFO "GCT: Filesystem download success.\n");
|
|
|
+ dev_info(&func->dev, "GCT: Filesystem download success.\n");
|
|
|
|
|
|
restore_fs:
|
|
|
kfree(tx_buf);
|