]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
mrf24j40: remove spi settings overwrite
authorAlexander Aring <alex.aring@gmail.com>
Mon, 21 Sep 2015 09:24:25 +0000 (11:24 +0200)
committerMarcel Holtmann <marcel@holtmann.org>
Tue, 22 Sep 2015 09:51:21 +0000 (11:51 +0200)
This patch removes spi settings while mrf24j40 probing. These settings
cannot be overwrite while device probing where spi controller should be
already configured. These settings need to be setup by device tree or
platform data.

Reviewed-by: Stefan Schmidt <stefan@osg.samsung.com>
Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
drivers/net/ieee802154/mrf24j40.c

index de63cba88fa0fdbe72a162bd914d02faaf540996..41d9f577014869878c2472ad368c2309529fb310 100644 (file)
@@ -746,9 +746,11 @@ static int mrf24j40_probe(struct spi_device *spi)
        if (!devrec->buf)
                goto err_register_device;
 
-       spi->mode = SPI_MODE_0; /* TODO: Is this appropriate for right here? */
-       if (spi->max_speed_hz > MAX_SPI_SPEED_HZ)
-               spi->max_speed_hz = MAX_SPI_SPEED_HZ;
+       if (spi->max_speed_hz > MAX_SPI_SPEED_HZ) {
+               dev_warn(&spi->dev, "spi clock above possible maximum: %d",
+                        MAX_SPI_SPEED_HZ);
+               return -EINVAL;
+       }
 
        mutex_init(&devrec->buffer_mutex);
        init_completion(&devrec->tx_complete);