Skip to content

Commit

Permalink
greybus: spi: fix and cleanup spi devices handling
Browse files Browse the repository at this point in the history
Cleanup and remove the spi_devices from the greybus spi handling as they
are not needed and they were completely misused.

With this the gb_spi_init does not make sense to exist anymore, so just
remove it and handle the master config directly from connection init.

Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org>
Reported-by: Johan Hovold <johan@hovoldconsulting.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
  • Loading branch information
Rui Miguel Silva authored and Greg Kroah-Hartman committed Dec 15, 2015
1 parent 4a0c445 commit 65fabd1
Showing 1 changed file with 3 additions and 21 deletions.
24 changes: 3 additions & 21 deletions drivers/staging/greybus/spi.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ struct gb_spi {
u8 num_chipselect;
u32 min_speed_hz;
u32 max_speed_hz;
struct spi_device *spi_devices;
};

static struct spi_master *get_master_from_spi(struct gb_spi *spi)
Expand Down Expand Up @@ -284,7 +283,7 @@ static int gb_spi_setup_device(struct gb_spi *spi, u8 cs)
struct gb_spi_device_config_request request;
struct gb_spi_device_config_response response;
struct spi_board_info spi_board = { {0} };
struct spi_device *spidev = &spi->spi_devices[cs];
struct spi_device *spidev;
int ret;

request.chip_select = cs;
Expand All @@ -308,24 +307,6 @@ static int gb_spi_setup_device(struct gb_spi *spi, u8 cs)
return 0;
}

static int gb_spi_init(struct gb_spi *spi)
{
int ret;

/* get master configuration */
ret = gb_spi_get_master_config(spi);
if (ret)
return ret;

spi->spi_devices = kcalloc(spi->num_chipselect,
sizeof(struct spi_device), GFP_KERNEL);
if (!spi->spi_devices)
return -ENOMEM;

return ret;
}


static int gb_spi_connection_init(struct gb_connection *connection)
{
struct gb_spi *spi;
Expand All @@ -344,7 +325,8 @@ static int gb_spi_connection_init(struct gb_connection *connection)
spi->connection = connection;
connection->private = master;

ret = gb_spi_init(spi);
/* get master configuration */
ret = gb_spi_get_master_config(spi);
if (ret)
goto out_put_master;

Expand Down

0 comments on commit 65fabd1

Please sign in to comment.