@@ -1440,7 +1440,7 @@ static int spi_transfer_wait(struct spi_controller *ctlr,
1440
1440
u32 speed_hz = xfer -> speed_hz ;
1441
1441
unsigned long long ms ;
1442
1442
1443
- if (spi_controller_is_slave (ctlr )) {
1443
+ if (spi_controller_is_target (ctlr )) {
1444
1444
if (wait_for_completion_interruptible (& ctlr -> xfer_completion )) {
1445
1445
dev_dbg (& msg -> spi -> dev , "SPI transfer interrupted\n" );
1446
1446
return - EINTR ;
@@ -2425,7 +2425,7 @@ static int of_spi_parse_dt(struct spi_controller *ctlr, struct spi_device *spi,
2425
2425
}
2426
2426
}
2427
2427
2428
- if (spi_controller_is_slave (ctlr )) {
2428
+ if (spi_controller_is_target (ctlr )) {
2429
2429
if (!of_node_name_eq (nc , "slave" )) {
2430
2430
dev_err (& ctlr -> dev , "%pOF is not called 'slave'\n" ,
2431
2431
nc );
@@ -3321,7 +3321,7 @@ int spi_register_controller(struct spi_controller *ctlr)
3321
3321
*/
3322
3322
dev_set_name (& ctlr -> dev , "spi%u" , ctlr -> bus_num );
3323
3323
3324
- if (!spi_controller_is_slave (ctlr ) && ctlr -> use_gpio_descriptors ) {
3324
+ if (!spi_controller_is_target (ctlr ) && ctlr -> use_gpio_descriptors ) {
3325
3325
status = spi_get_gpio_descs (ctlr );
3326
3326
if (status )
3327
3327
goto free_bus_id ;
@@ -3349,7 +3349,7 @@ int spi_register_controller(struct spi_controller *ctlr)
3349
3349
if (status < 0 )
3350
3350
goto free_bus_id ;
3351
3351
dev_dbg (dev , "registered %s %s\n" ,
3352
- spi_controller_is_slave (ctlr ) ? "slave " : "master " ,
3352
+ spi_controller_is_target (ctlr ) ? "target " : "host " ,
3353
3353
dev_name (& ctlr -> dev ));
3354
3354
3355
3355
/*
0 commit comments