Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7db06b5 authored by David Brownell's avatar David Brownell Committed by Linus Torvalds
Browse files

spi: move more spi_setup() functionality into core 



Move some common spi_setup() error checks into the SPI framework from the
spi_master controller drivers:

 - Add a new "mode_bits" field to spi_master

 - Use that in spi_setup to validate the spi->mode value being
   requested.  Setting this new field is now mandatory for any
   controller supporting more than vanilla SPI_MODE_0.

 - Update all spi_master drivers to:

     * Initialize that field
     * Remove current spi_setup() checks using that value.

This is a net minor code shrink.

Signed-off-by: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7d077197

drivers/spi/atmel_spi.c

+3 −9
Original line number Diff line number Diff line
@@ -530,9 +530,6 @@ atmel_spi_interrupt(int irq, void *dev_id) 
	return ret;

}



/* the spi->mode bits understood by this driver: */

#define MODEBITS (SPI_CPOL | SPI_CPHA | SPI_CS_HIGH)



static int atmel_spi_setup(struct spi_device *spi)

{

	struct atmel_spi	*as;
@@ -562,12 +559,6 @@ static int atmel_spi_setup(struct spi_device *spi) 
		return -EINVAL;

	}



	if (spi->mode & ~MODEBITS) {

		dev_dbg(&spi->dev, "setup: unsupported mode bits %x\n",

			spi->mode & ~MODEBITS);

		return -EINVAL;

	}



	/* see notes above re chipselect */

	if (!atmel_spi_is_v2()

			&& spi->chip_select == 0
@@ -773,6 +764,9 @@ static int __init atmel_spi_probe(struct platform_device *pdev) 
	if (!master)

		goto out_free;



	/* the spi->mode bits understood by this driver: */

	master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;



	master->bus_num = pdev->id;

	master->num_chipselect = 4;

	master->setup = atmel_spi_setup;

drivers/spi/au1550_spi.c

+3 −9
Original line number Diff line number Diff line
@@ -284,9 +284,6 @@ static int au1550_spi_setupxfer(struct spi_device *spi, struct spi_transfer *t) 
	return 0;

}



/* the spi->mode bits understood by this driver: */

#define MODEBITS (SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LSB_FIRST)



static int au1550_spi_setup(struct spi_device *spi)

{

	struct au1550_spi *hw = spi_master_get_devdata(spi->master);
@@ -297,12 +294,6 @@ static int au1550_spi_setup(struct spi_device *spi) 
		return -EINVAL;

	}



	if (spi->mode & ~MODEBITS) {

		dev_dbg(&spi->dev, "setup: unsupported mode bits %x\n",

			spi->mode & ~MODEBITS);

		return -EINVAL;

	}



	if (spi->max_speed_hz == 0)

		spi->max_speed_hz = hw->freq_max;

	if (spi->max_speed_hz > hw->freq_max
@@ -779,6 +770,9 @@ static int __init au1550_spi_probe(struct platform_device *pdev) 
		goto err_nomem;

	}



	/* the spi->mode bits understood by this driver: */

	master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LSB_FIRST;



	hw = spi_master_get_devdata(master);



	hw->master = spi_master_get(master);

drivers/spi/mpc52xx_psc_spi.c

+3 −9
Original line number Diff line number Diff line
@@ -261,9 +261,6 @@ static void mpc52xx_psc_spi_work(struct work_struct *work) 
	spin_unlock_irq(&mps->lock);

}



/* the spi->mode bits understood by this driver: */

#define MODEBITS (SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LSB_FIRST)



static int mpc52xx_psc_spi_setup(struct spi_device *spi)

{

	struct mpc52xx_psc_spi *mps = spi_master_get_devdata(spi->master);
@@ -273,12 +270,6 @@ static int mpc52xx_psc_spi_setup(struct spi_device *spi) 
	if (spi->bits_per_word%8)

		return -EINVAL;



	if (spi->mode & ~MODEBITS) {

		dev_dbg(&spi->dev, "setup: unsupported mode bits %x\n",

			spi->mode & ~MODEBITS);

		return -EINVAL;

	}



	if (!cs) {

		cs = kzalloc(sizeof *cs, GFP_KERNEL);

		if (!cs)
@@ -385,6 +376,9 @@ static int __init mpc52xx_psc_spi_do_probe(struct device *dev, u32 regaddr, 
	dev_set_drvdata(dev, master);

	mps = spi_master_get_devdata(master);



	/* the spi->mode bits understood by this driver: */

	master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LSB_FIRST;



	mps->irq = irq;

	if (pdata == NULL) {

		dev_warn(dev, "probe called without platform data, no "

drivers/spi/omap2_mcspi.c

+3 −9
Original line number Diff line number Diff line
@@ -603,9 +603,6 @@ static int omap2_mcspi_request_dma(struct spi_device *spi) 
	return 0;

}



/* the spi->mode bits understood by this driver: */

#define MODEBITS (SPI_CPOL | SPI_CPHA | SPI_CS_HIGH)



static int omap2_mcspi_setup(struct spi_device *spi)

{

	int			ret;
@@ -613,12 +610,6 @@ static int omap2_mcspi_setup(struct spi_device *spi) 
	struct omap2_mcspi_dma	*mcspi_dma;

	struct omap2_mcspi_cs	*cs = spi->controller_state;



	if (spi->mode & ~MODEBITS) {

		dev_dbg(&spi->dev, "setup: unsupported mode bits %x\n",

			spi->mode & ~MODEBITS);

		return -EINVAL;

	}



	if (spi->bits_per_word < 4 || spi->bits_per_word > 32) {

		dev_dbg(&spi->dev, "setup: unsupported %d bit words\n",

			spi->bits_per_word);
@@ -982,6 +973,9 @@ static int __init omap2_mcspi_probe(struct platform_device *pdev) 
		return -ENOMEM;

	}



	/* the spi->mode bits understood by this driver: */

	master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;



	if (pdev->id != -1)

		master->bus_num = pdev->id;

drivers/spi/omap_uwire.c

+3 −9
Original line number Diff line number Diff line
@@ -447,19 +447,10 @@ done: 
	return status;

}



/* the spi->mode bits understood by this driver: */

#define MODEBITS (SPI_CPOL | SPI_CPHA | SPI_CS_HIGH)



static int uwire_setup(struct spi_device *spi)

{

	struct uwire_state *ust = spi->controller_state;



	if (spi->mode & ~MODEBITS) {

		dev_dbg(&spi->dev, "setup: unsupported mode bits %x\n",

			spi->mode & ~MODEBITS);

		return -EINVAL;

	}



	if (ust == NULL) {

		ust = kzalloc(sizeof(*ust), GFP_KERNEL);

		if (ust == NULL)
@@ -520,6 +511,9 @@ static int __init uwire_probe(struct platform_device *pdev) 


	uwire_write_reg(UWIRE_SR3, 1);



	/* the spi->mode bits understood by this driver: */

	master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH;



	master->bus_num = 2;	/* "official" */

	master->num_chipselect = 4;

	master->setup = uwire_setup;