.free = marvell_nand_ooblayout_free,
 };
 
-static int marvell_nand_hw_ecc_ctrl_init(struct mtd_info *mtd,
-                                        struct nand_ecc_ctrl *ecc)
+static int marvell_nand_hw_ecc_controller_init(struct mtd_info *mtd,
+                                              struct nand_ecc_ctrl *ecc)
 {
        struct nand_chip *chip = mtd_to_nand(mtd);
        struct marvell_nfc *nfc = to_marvell_nfc(chip->controller);
 
        switch (ecc->mode) {
        case NAND_ECC_HW:
-               ret = marvell_nand_hw_ecc_ctrl_init(mtd, ecc);
+               ret = marvell_nand_hw_ecc_controller_init(mtd, ecc);
                if (ret)
                        return ret;
                break;