@@ -1255,7 +1255,7 @@ static bool mtk_snand_supports_op(struct spi_mem *mem,
12551255
12561256static int mtk_snand_adjust_op_size (struct spi_mem * mem , struct spi_mem_op * op )
12571257{
1258- struct mtk_snand * ms = spi_controller_get_devdata (mem -> spi -> master );
1258+ struct mtk_snand * ms = spi_controller_get_devdata (mem -> spi -> controller );
12591259 // page ops transfer size must be exactly ((sector_size + spare_size) *
12601260 // nsectors). Limit the op size if the caller requests more than that.
12611261 // exec_op will read more than needed and discard the leftover if the
@@ -1282,7 +1282,7 @@ static int mtk_snand_adjust_op_size(struct spi_mem *mem, struct spi_mem_op *op)
12821282
12831283static int mtk_snand_exec_op (struct spi_mem * mem , const struct spi_mem_op * op )
12841284{
1285- struct mtk_snand * ms = spi_controller_get_devdata (mem -> spi -> master );
1285+ struct mtk_snand * ms = spi_controller_get_devdata (mem -> spi -> controller );
12861286
12871287 dev_dbg (ms -> dev , "OP %02x ADDR %08llX@%d:%u DATA %d:%u" , op -> cmd .opcode ,
12881288 op -> addr .val , op -> addr .buswidth , op -> addr .nbytes ,
@@ -1382,7 +1382,7 @@ static int mtk_snand_probe(struct platform_device *pdev)
13821382 if (!dev_id )
13831383 return - EINVAL ;
13841384
1385- ctlr = devm_spi_alloc_master (& pdev -> dev , sizeof (* ms ));
1385+ ctlr = devm_spi_alloc_host (& pdev -> dev , sizeof (* ms ));
13861386 if (!ctlr )
13871387 return - ENOMEM ;
13881388 platform_set_drvdata (pdev , ctlr );
0 commit comments