nand: fix some parameter modification [1/1]

PD#SWPL-50970

Problem:
nand base interface is changed after sync

Solution:
fix the interface which is changed.

Verify:
none

Change-Id: I97946d2e5b400ade809ffe1b935c469aad7c38f2
Signed-off-by: Liang Yang <liang.yang@amlogic.com>

diff --git a/drivers/amlogic/mtd_meson8b/mtd_driver.c b/drivers/amlogic/mtd_meson8b/mtd_driver.c
index 7c4b6c980009374da3bb4cc781b26a28571e7b6d..e764a5ad8f70f16230cee9bf0c7bcc6bbe92d54b 100644 (file)
--- a/drivers/amlogic/mtd_meson8b/mtd_driver.c
+++ b/drivers/amlogic/mtd_meson8b/mtd_driver.c
@@ -248,7 +248,7 @@ static int mtd_nand_remove(struct platform_device *pdev)
                if (aml_chip) {
                        mtd = aml_chip->mtd;
                        if (mtd) {
-                               nand_release(mtd);
+                               nand_release(mtd_to_nand(mtd));
                                kfree(mtd);
                        }
                        kfree(aml_chip);

diff --git a/drivers/amlogic/usb/dwc_otg/310/common_port/usb.h b/drivers/amlogic/usb/dwc_otg/310/common_port/usb.h
index 6b955667e78e6749802fa83514511cfb44b3b00d..a98ea01abec76fa15c652fe9c08a4f7aabe588db 100644 (file)
--- a/drivers/amlogic/usb/dwc_otg/310/common_port/usb.h
+++ b/drivers/amlogic/usb/dwc_otg/310/common_port/usb.h
@@ -350,9 +350,8 @@ typedef struct {
        uByte           bDescriptorType;
        uWord           bString[127];
 } UPACKED usb_string_descriptor_t;
-#ifdef CONFIG_AMLOGIC_SYNC_20210524
+
 #undef USB_MAX_STRING_LEN
-#endif
 #define USB_MAX_STRING_LEN 128
 #define USB_LANGUAGE_TABLE 0   /* # of the string language id table */