@@ -69,7 +69,7 @@ struct mtk_spi_slave {
69
69
struct clk * spi_clk ;
70
70
struct completion xfer_done ;
71
71
struct spi_transfer * cur_transfer ;
72
- bool slave_aborted ;
72
+ bool target_aborted ;
73
73
const struct mtk_spi_compatible * dev_comp ;
74
74
};
75
75
@@ -118,7 +118,7 @@ static void mtk_spi_slave_disable_xfer(struct mtk_spi_slave *mdata)
118
118
static int mtk_spi_slave_wait_for_completion (struct mtk_spi_slave * mdata )
119
119
{
120
120
if (wait_for_completion_interruptible (& mdata -> xfer_done ) ||
121
- mdata -> slave_aborted ) {
121
+ mdata -> target_aborted ) {
122
122
dev_err (mdata -> dev , "interrupted\n" );
123
123
return - EINTR ;
124
124
}
@@ -286,7 +286,7 @@ static int mtk_spi_slave_transfer_one(struct spi_controller *ctlr,
286
286
struct mtk_spi_slave * mdata = spi_controller_get_devdata (ctlr );
287
287
288
288
reinit_completion (& mdata -> xfer_done );
289
- mdata -> slave_aborted = false;
289
+ mdata -> target_aborted = false;
290
290
mdata -> cur_transfer = xfer ;
291
291
292
292
if (xfer -> len > mdata -> dev_comp -> max_fifo_size )
@@ -314,11 +314,11 @@ static int mtk_spi_slave_setup(struct spi_device *spi)
314
314
return 0 ;
315
315
}
316
316
317
- static int mtk_slave_abort (struct spi_controller * ctlr )
317
+ static int mtk_target_abort (struct spi_controller * ctlr )
318
318
{
319
319
struct mtk_spi_slave * mdata = spi_controller_get_devdata (ctlr );
320
320
321
- mdata -> slave_aborted = true;
321
+ mdata -> target_aborted = true;
322
322
complete (& mdata -> xfer_done );
323
323
324
324
return 0 ;
@@ -402,7 +402,7 @@ static int mtk_spi_slave_probe(struct platform_device *pdev)
402
402
ctlr -> prepare_message = mtk_spi_slave_prepare_message ;
403
403
ctlr -> transfer_one = mtk_spi_slave_transfer_one ;
404
404
ctlr -> setup = mtk_spi_slave_setup ;
405
- ctlr -> slave_abort = mtk_slave_abort ;
405
+ ctlr -> target_abort = mtk_target_abort ;
406
406
407
407
of_id = of_match_node (mtk_spi_slave_of_match , pdev -> dev .of_node );
408
408
if (!of_id ) {
0 commit comments