aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2013-08-11 11:07:29 -0400
committerMark Brown <broonie@linaro.org>2013-08-20 06:34:07 -0400
commitfe81109b6d852cd5ff37099e2738538198c22dfd (patch)
tree5ef0ac306f4749bf62b450e20e6f38afc0df3759
parente1b18ea809a4493c316030e527d486126f3c3162 (diff)
spi: octeon: Remove empty octeon_spi_nop_transfer_hardware function
Both prepare_transfer_hardware and unprepare_transfer_hardware callbacks are optional, so we don't need to implement an empty function for them. Signed-off-by: Axel Lin <axel.lin@ingics.com> Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--drivers/spi/spi-octeon.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/spi/spi-octeon.c b/drivers/spi/spi-octeon.c
index ad924a147ea8..983021a1f9ee 100644
--- a/drivers/spi/spi-octeon.c
+++ b/drivers/spi/spi-octeon.c
@@ -260,11 +260,6 @@ static void octeon_spi_cleanup(struct spi_device *spi)
260 kfree(old_setup); 260 kfree(old_setup);
261} 261}
262 262
263static int octeon_spi_nop_transfer_hardware(struct spi_master *master)
264{
265 return 0;
266}
267
268static int octeon_spi_probe(struct platform_device *pdev) 263static int octeon_spi_probe(struct platform_device *pdev)
269{ 264{
270 struct resource *res_mem; 265 struct resource *res_mem;
@@ -304,9 +299,7 @@ static int octeon_spi_probe(struct platform_device *pdev)
304 299
305 master->setup = octeon_spi_setup; 300 master->setup = octeon_spi_setup;
306 master->cleanup = octeon_spi_cleanup; 301 master->cleanup = octeon_spi_cleanup;
307 master->prepare_transfer_hardware = octeon_spi_nop_transfer_hardware;
308 master->transfer_one_message = octeon_spi_transfer_one_message; 302 master->transfer_one_message = octeon_spi_transfer_one_message;
309 master->unprepare_transfer_hardware = octeon_spi_nop_transfer_hardware;
310 303
311 master->dev.of_node = pdev->dev.of_node; 304 master->dev.of_node = pdev->dev.of_node;
312 err = spi_register_master(master); 305 err = spi_register_master(master);