Commit 6aba6ed8 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Linus Walleij
Browse files

pinctrl: mcp23s08: Get rid of legacy platform data 



Platform data is a legacy interface to supply device properties
to the driver. In this case we even don't have in-kernel users
for it. Just remove it for good.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20200407173849.43628-1-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent f9a8744d

drivers/pinctrl/pinctrl-mcp23s08.c

+12 −30
Original line number Original line Diff line number Diff line
@@ -8,7 +8,6 @@ 
#include <linux/gpio/driver.h>

#include <linux/gpio/driver.h>

#include <linux/i2c.h>

#include <linux/i2c.h>

#include <linux/spi/spi.h>

#include <linux/spi/spi.h>

#include <linux/spi/mcp23s08.h>

#include <linux/slab.h>

#include <linux/slab.h>

#include <asm/byteorder.h>

#include <asm/byteorder.h>

#include <linux/interrupt.h>

#include <linux/interrupt.h>
@@ -914,16 +913,9 @@ MODULE_DEVICE_TABLE(of, mcp23s08_i2c_of_match); 
static int mcp230xx_probe(struct i2c_client *client,

static int mcp230xx_probe(struct i2c_client *client,

				    const struct i2c_device_id *id)

				    const struct i2c_device_id *id)

{

{

	struct mcp23s08_platform_data *pdata, local_pdata;

	struct mcp23s08 *mcp;

	struct mcp23s08 *mcp;

	int status;

	int status;





	pdata = dev_get_platdata(&client->dev);

	if (!pdata) {

		pdata = &local_pdata;

		pdata->base = -1;

	}



	mcp = devm_kzalloc(&client->dev, sizeof(*mcp), GFP_KERNEL);

	mcp = devm_kzalloc(&client->dev, sizeof(*mcp), GFP_KERNEL);

	if (!mcp)

	if (!mcp)

		return -ENOMEM;

		return -ENOMEM;
@@ -937,7 +929,7 @@ static int mcp230xx_probe(struct i2c_client *client, 
	mcp->irq_chip.irq_bus_sync_unlock = mcp23s08_irq_bus_unlock;

	mcp->irq_chip.irq_bus_sync_unlock = mcp23s08_irq_bus_unlock;





	status = mcp23s08_probe_one(mcp, &client->dev, client, client->addr,

	status = mcp23s08_probe_one(mcp, &client->dev, client, client->addr,

				    id->driver_data, pdata->base, 0);

				    id->driver_data, -1, 0);

	if (status)

	if (status)

		return status;

		return status;
@@ -986,13 +978,13 @@ static void mcp23s08_i2c_exit(void) { } 




static int mcp23s08_probe(struct spi_device *spi)

static int mcp23s08_probe(struct spi_device *spi)

{

{

	struct mcp23s08_platform_data	*pdata, local_pdata;

	unsigned			addr;

	unsigned			addr;

	int				chips = 0;

	int				chips = 0;

	struct mcp23s08_driver_data	*data;

	struct mcp23s08_driver_data	*data;

	int				status, type;

	int				status, type;

	unsigned			ngpio = 0;

	unsigned			ngpio = 0;

	const struct			of_device_id *match;

	const struct			of_device_id *match;

	u32				spi_present_mask;





	match = of_match_device(of_match_ptr(mcp23s08_spi_of_match), &spi->dev);

	match = of_match_device(of_match_ptr(mcp23s08_spi_of_match), &spi->dev);

	if (match)

	if (match)
@@ -1000,32 +992,24 @@ static int mcp23s08_probe(struct spi_device *spi) 
	else

	else

		type = spi_get_device_id(spi)->driver_data;

		type = spi_get_device_id(spi)->driver_data;





	pdata = dev_get_platdata(&spi->dev);

	if (!pdata) {

		pdata = &local_pdata;

		pdata->base = -1;



	status = device_property_read_u32(&spi->dev,

	status = device_property_read_u32(&spi->dev,

			"microchip,spi-present-mask", &pdata->spi_present_mask);

			"microchip,spi-present-mask", &spi_present_mask);

	if (status) {

	if (status) {

		status = device_property_read_u32(&spi->dev,

		status = device_property_read_u32(&spi->dev,

				"mcp,spi-present-mask",

				"mcp,spi-present-mask", &spi_present_mask);

				&pdata->spi_present_mask);



		if (status) {

		if (status) {

			dev_err(&spi->dev, "missing spi-present-mask");

			dev_err(&spi->dev, "missing spi-present-mask");

			return -ENODEV;

			return -ENODEV;

		}

		}

	}

	}

	}





	if (!pdata->spi_present_mask || pdata->spi_present_mask > 0xff) {

	if (!spi_present_mask || spi_present_mask > 0xff) {

		dev_err(&spi->dev, "invalid spi-present-mask");

		dev_err(&spi->dev, "invalid spi-present-mask");

		return -ENODEV;

		return -ENODEV;

	}

	}





	for (addr = 0; addr < MCP_MAX_DEV_PER_CS; addr++) {

	for (addr = 0; addr < MCP_MAX_DEV_PER_CS; addr++) {

		if (pdata->spi_present_mask & BIT(addr))

		if (spi_present_mask & BIT(addr))

			chips++;

			chips++;

	}

	}
@@ -1040,7 +1024,7 @@ static int mcp23s08_probe(struct spi_device *spi) 
	spi_set_drvdata(spi, data);

	spi_set_drvdata(spi, data);





	for (addr = 0; addr < MCP_MAX_DEV_PER_CS; addr++) {

	for (addr = 0; addr < MCP_MAX_DEV_PER_CS; addr++) {

		if (!(pdata->spi_present_mask & BIT(addr)))

		if (!(spi_present_mask & BIT(addr)))

			continue;

			continue;

		chips--;

		chips--;

		data->mcp[addr] = &data->chip[chips];

		data->mcp[addr] = &data->chip[chips];
@@ -1054,12 +1038,10 @@ static int mcp23s08_probe(struct spi_device *spi) 
			mcp23s08_irq_bus_unlock;

			mcp23s08_irq_bus_unlock;

		status = mcp23s08_probe_one(data->mcp[addr], &spi->dev, spi,

		status = mcp23s08_probe_one(data->mcp[addr], &spi->dev, spi,

					    0x40 | (addr << 1), type,

					    0x40 | (addr << 1), type,

					    pdata->base, addr);

					    -1, addr);

		if (status < 0)

		if (status < 0)

			return status;

			return status;





		if (pdata->base != -1)

			pdata->base += data->mcp[addr]->chip.ngpio;

		ngpio += data->mcp[addr]->chip.ngpio;

		ngpio += data->mcp[addr]->chip.ngpio;

	}

	}

	data->ngpio = ngpio;

	data->ngpio = ngpio;

include/linux/spi/mcp23s08.h

deleted100644 → 0
+0 −18
Original line number Original line Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

struct mcp23s08_platform_data {

	/* For mcp23s08, up to 4 slaves (numbered 0..3) can share one SPI

	 * chipselect, each providing 1 gpio_chip instance with 8 gpios.

	 * For mpc23s17, up to 8 slaves (numbered 0..7) can share one SPI

	 * chipselect, each providing 1 gpio_chip (port A + port B) with

	 * 16 gpios.

	 */

	u32 spi_present_mask;



	/* "base" is the number of the first GPIO or -1 for dynamic

	 * assignment. If there are gaps in chip addressing the GPIO

	 * numbers are sequential .. so for example if only slaves 0

	 * and 3 are present, their GPIOs range from base to base+15

	 * (or base+31 for s17 variant).

	 */

	unsigned	base;

};