From 8a343b9b00a16a6c11bbf159930d828015129a06 Mon Sep 17 00:00:00 2001 From: Alexander Shiyan Date: Thu, 10 Apr 2014 20:23:42 +0400 Subject: [PATCH] spi: i.MX: Optimise driver private structure No need to store init() function in the driver private structure since it called only once during startup. Signed-off-by: Alexander Shiyan Signed-off-by: Sascha Hauer --- drivers/spi/imx_spi.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/spi/imx_spi.c b/drivers/spi/imx_spi.c index 4e4372587..5f5d790dc 100644 --- a/drivers/spi/imx_spi.c +++ b/drivers/spi/imx_spi.c @@ -117,7 +117,6 @@ struct imx_spi { unsigned int (*xchg_single)(struct imx_spi *imx, u32 data); void (*chipselect)(struct spi_device *spi, int active); - void (*init)(struct imx_spi *imx); }; struct spi_imx_devtype_data { @@ -383,10 +382,6 @@ static void cspi_2_3_chipselect(struct spi_device *spi, int is_active) gpio_set_value(gpio, gpio_cs); } -static void cspi_2_3_init(struct imx_spi *imx) -{ -} - static void imx_spi_do_transfer(struct spi_device *spi, struct spi_transfer *t) { struct imx_spi *imx = container_of(spi->master, struct imx_spi, master); @@ -459,7 +454,6 @@ static __maybe_unused struct spi_imx_devtype_data spi_imx_devtype_data_0_7 = { static __maybe_unused struct spi_imx_devtype_data spi_imx_devtype_data_2_3 = { .chipselect = cspi_2_3_chipselect, .xchg_single = cspi_2_3_xchg_single, - .init = cspi_2_3_init, }; static int imx_spi_dt_probe(struct imx_spi *imx) @@ -523,10 +517,10 @@ static int imx_spi_probe(struct device_d *dev) imx->chipselect = devdata->chipselect; imx->xchg_single = devdata->xchg_single; - imx->init = devdata->init; imx->regs = dev_request_mem_region(dev, 0); - imx->init(imx); + if (devdata->init) + devdata->init(imx); spi_register_master(master);