History

spi: bitbang: Introduce spi_bitbang_init()

Move all of the code doing struct spi_bitbang initialization, so that it can be paired with devm_spi_register_master() in order to avoid having to call spi_bitbang_stop() explicitly.

Andrey Smirnov committed 7 years ago

Commit 45beec31 parent 8b797492 files · +40 −27Browse files

Unified · Split

2 files
  1. drivers/spi/spi-bitbang.c +39 −27
  2. include/linux/spi/spi_bitbang.h +1 −0
drivers/spi/spi-bitbang.c+39−27
@@ -335,6 +335,42 @@ static void spi_bitbang_set_cs(struct spi_device *spi, bool enable) · 334 unmodified lines
335 335
336/*----------------------------------------------------------------------*/336/*----------------------------------------------------------------------*/
337 337
338int spi_bitbang_init(struct spi_bitbang *bitbang)
339{
340 struct spi_master *master = bitbang->master;
341
342 if (!master || !bitbang->chipselect)
343 return -EINVAL;
344
345 mutex_init(&bitbang->lock);
346
347 if (!master->mode_bits)
348 master->mode_bits = SPI_CPOL | SPI_CPHA | bitbang->flags;
349
350 if (master->transfer || master->transfer_one_message)
351 return -EINVAL;
352
353 master->prepare_transfer_hardware = spi_bitbang_prepare_hardware;
354 master->unprepare_transfer_hardware = spi_bitbang_unprepare_hardware;
355 master->transfer_one = spi_bitbang_transfer_one;
356 master->set_cs = spi_bitbang_set_cs;
357
358 if (!bitbang->txrx_bufs) {
359 bitbang->use_dma = 0;
360 bitbang->txrx_bufs = spi_bitbang_bufs;
361 if (!master->setup) {
362 if (!bitbang->setup_transfer)
363 bitbang->setup_transfer =
364 spi_bitbang_setup_transfer;
365 master->setup = spi_bitbang_setup;
366 master->cleanup = spi_bitbang_cleanup;
367 }
368 }
369
370 return 0;
371}
372EXPORT_SYMBOL_GPL(spi_bitbang_init);
373
338/**374/**
339 * spi_bitbang_start - start up a polled/bitbanging SPI master driver375 * spi_bitbang_start - start up a polled/bitbanging SPI master driver
340 * @bitbang: driver handle376 * @bitbang: driver handle
@@ -368,33 +404,9 @@ int spi_bitbang_start(struct spi_bitbang *bitbang) · 27 unmodified lines
368 struct spi_master *master = bitbang->master;404 struct spi_master *master = bitbang->master;
369 int ret;405 int ret;
370 406
371 if (!master || !bitbang->chipselect)407 ret = spi_bitbang_init(bitbang);
372 return -EINVAL;408 if (ret)
373 409 return ret;
374 mutex_init(&bitbang->lock);
375
376 if (!master->mode_bits)
377 master->mode_bits = SPI_CPOL | SPI_CPHA | bitbang->flags;
378
379 if (master->transfer || master->transfer_one_message)
380 return -EINVAL;
381
382 master->prepare_transfer_hardware = spi_bitbang_prepare_hardware;
383 master->unprepare_transfer_hardware = spi_bitbang_unprepare_hardware;
384 master->transfer_one = spi_bitbang_transfer_one;
385 master->set_cs = spi_bitbang_set_cs;
386
387 if (!bitbang->txrx_bufs) {
388 bitbang->use_dma = 0;
389 bitbang->txrx_bufs = spi_bitbang_bufs;
390 if (!master->setup) {
391 if (!bitbang->setup_transfer)
392 bitbang->setup_transfer =
393 spi_bitbang_setup_transfer;
394 master->setup = spi_bitbang_setup;
395 master->cleanup = spi_bitbang_cleanup;
396 }
397 }
398 410
399 /* driver may get busy before register() returns, especially411 /* driver may get busy before register() returns, especially
400 * if someone registered boardinfo for devices412 * if someone registered boardinfo for devices
include/linux/spi/spi_bitbang.h+1−0
@@ -44,6 +44,7 @@ extern int spi_bitbang_setup_transfer(struct spi_device *spi, · 43 unmodified lines
44 44
45/* start or stop queue processing */45/* start or stop queue processing */
46extern int spi_bitbang_start(struct spi_bitbang *spi);46extern int spi_bitbang_start(struct spi_bitbang *spi);
47extern int spi_bitbang_init(struct spi_bitbang *spi);
47extern void spi_bitbang_stop(struct spi_bitbang *spi);48extern void spi_bitbang_stop(struct spi_bitbang *spi);
48 49
49#endif /* __SPI_BITBANG_H */50#endif /* __SPI_BITBANG_H */

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t