@@ -69,7 +69,7 @@ struct mtk_spi_slave {
6969 struct clk * spi_clk ;
7070 struct completion xfer_done ;
7171 struct spi_transfer * cur_transfer ;
72- bool slave_aborted ;
72+ bool target_aborted ;
7373 const struct mtk_spi_compatible * dev_comp ;
7474};
7575
@@ -118,7 +118,7 @@ static void mtk_spi_slave_disable_xfer(struct mtk_spi_slave *mdata)
118118static int mtk_spi_slave_wait_for_completion (struct mtk_spi_slave * mdata )
119119{
120120 if (wait_for_completion_interruptible (& mdata -> xfer_done ) ||
121- mdata -> slave_aborted ) {
121+ mdata -> target_aborted ) {
122122 dev_err (mdata -> dev , "interrupted\n" );
123123 return - EINTR ;
124124 }
@@ -286,7 +286,7 @@ static int mtk_spi_slave_transfer_one(struct spi_controller *ctlr,
286286 struct mtk_spi_slave * mdata = spi_controller_get_devdata (ctlr );
287287
288288 reinit_completion (& mdata -> xfer_done );
289- mdata -> slave_aborted = false;
289+ mdata -> target_aborted = false;
290290 mdata -> cur_transfer = xfer ;
291291
292292 if (xfer -> len > mdata -> dev_comp -> max_fifo_size )
@@ -314,11 +314,11 @@ static int mtk_spi_slave_setup(struct spi_device *spi)
314314 return 0 ;
315315}
316316
317- static int mtk_slave_abort (struct spi_controller * ctlr )
317+ static int mtk_target_abort (struct spi_controller * ctlr )
318318{
319319 struct mtk_spi_slave * mdata = spi_controller_get_devdata (ctlr );
320320
321- mdata -> slave_aborted = true;
321+ mdata -> target_aborted = true;
322322 complete (& mdata -> xfer_done );
323323
324324 return 0 ;
@@ -402,7 +402,7 @@ static int mtk_spi_slave_probe(struct platform_device *pdev)
402402 ctlr -> prepare_message = mtk_spi_slave_prepare_message ;
403403 ctlr -> transfer_one = mtk_spi_slave_transfer_one ;
404404 ctlr -> setup = mtk_spi_slave_setup ;
405- ctlr -> slave_abort = mtk_slave_abort ;
405+ ctlr -> target_abort = mtk_target_abort ;
406406
407407 of_id = of_match_node (mtk_spi_slave_of_match , pdev -> dev .of_node );
408408 if (!of_id ) {
0 commit comments