openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

spi/pl022: get rid of chipinfo dev pointer 

What is the dev pointer doing inside the platform data anyway.
We have another pointer to the actual device at hand, use that.

Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
This commit is contained in:
Linus Walleij 2010-10-01 11:47:32 +02:00 committed by Grant Likely
parent bde435a9ca
commit 5a1c98be1d
2 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/spi/amba-pl022.c
View File

@ -1597,58 +1597,58 @@ static int verify_controller_parameters(struct pl022 *pl022,
{ {
if ((chip_info->iface < SSP_INTERFACE_MOTOROLA_SPI) if ((chip_info->iface < SSP_INTERFACE_MOTOROLA_SPI)
|| (chip_info->iface > SSP_INTERFACE_UNIDIRECTIONAL)) { || (chip_info->iface > SSP_INTERFACE_UNIDIRECTIONAL)) {
dev_err(chip_info->dev, dev_err(&pl022->adev->dev,
"interface is configured incorrectly\n"); "interface is configured incorrectly\n");
return -EINVAL; return -EINVAL;
} }
if ((chip_info->iface == SSP_INTERFACE_UNIDIRECTIONAL) && if ((chip_info->iface == SSP_INTERFACE_UNIDIRECTIONAL) &&
(!pl022->vendor->unidir)) { (!pl022->vendor->unidir)) {
dev_err(chip_info->dev, dev_err(&pl022->adev->dev,
"unidirectional mode not supported in this " "unidirectional mode not supported in this "
"hardware version\n"); "hardware version\n");
return -EINVAL; return -EINVAL;
} }
if ((chip_info->hierarchy != SSP_MASTER) if ((chip_info->hierarchy != SSP_MASTER)
&& (chip_info->hierarchy != SSP_SLAVE)) { && (chip_info->hierarchy != SSP_SLAVE)) {
dev_err(chip_info->dev, dev_err(&pl022->adev->dev,
"hierarchy is configured incorrectly\n"); "hierarchy is configured incorrectly\n");
return -EINVAL; return -EINVAL;
} }
if (((chip_info->clk_freq).cpsdvsr < CPSDVR_MIN) if (((chip_info->clk_freq).cpsdvsr < CPSDVR_MIN)
|| ((chip_info->clk_freq).cpsdvsr > CPSDVR_MAX)) { || ((chip_info->clk_freq).cpsdvsr > CPSDVR_MAX)) {
dev_err(chip_info->dev, dev_err(&pl022->adev->dev,
"cpsdvsr is configured incorrectly\n"); "cpsdvsr is configured incorrectly\n");
return -EINVAL; return -EINVAL;
} }
if ((chip_info->com_mode != INTERRUPT_TRANSFER) if ((chip_info->com_mode != INTERRUPT_TRANSFER)
&& (chip_info->com_mode != DMA_TRANSFER) && (chip_info->com_mode != DMA_TRANSFER)
&& (chip_info->com_mode != POLLING_TRANSFER)) { && (chip_info->com_mode != POLLING_TRANSFER)) {
dev_err(chip_info->dev, dev_err(&pl022->adev->dev,
"Communication mode is configured incorrectly\n"); "Communication mode is configured incorrectly\n");
return -EINVAL; return -EINVAL;
} }
if ((chip_info->rx_lev_trig < SSP_RX_1_OR_MORE_ELEM) if ((chip_info->rx_lev_trig < SSP_RX_1_OR_MORE_ELEM)
|| (chip_info->rx_lev_trig > SSP_RX_32_OR_MORE_ELEM)) { || (chip_info->rx_lev_trig > SSP_RX_32_OR_MORE_ELEM)) {
dev_err(chip_info->dev, dev_err(&pl022->adev->dev,
"RX FIFO Trigger Level is configured incorrectly\n"); "RX FIFO Trigger Level is configured incorrectly\n");
return -EINVAL; return -EINVAL;
} }
if ((chip_info->tx_lev_trig < SSP_TX_1_OR_MORE_EMPTY_LOC) if ((chip_info->tx_lev_trig < SSP_TX_1_OR_MORE_EMPTY_LOC)
|| (chip_info->tx_lev_trig > SSP_TX_32_OR_MORE_EMPTY_LOC)) { || (chip_info->tx_lev_trig > SSP_TX_32_OR_MORE_EMPTY_LOC)) {
dev_err(chip_info->dev, dev_err(&pl022->adev->dev,
"TX FIFO Trigger Level is configured incorrectly\n"); "TX FIFO Trigger Level is configured incorrectly\n");
return -EINVAL; return -EINVAL;
} }
if (chip_info->iface == SSP_INTERFACE_NATIONAL_MICROWIRE) { if (chip_info->iface == SSP_INTERFACE_NATIONAL_MICROWIRE) {
if ((chip_info->ctrl_len < SSP_BITS_4) if ((chip_info->ctrl_len < SSP_BITS_4)
|| (chip_info->ctrl_len > SSP_BITS_32)) { || (chip_info->ctrl_len > SSP_BITS_32)) {
dev_err(chip_info->dev, dev_err(&pl022->adev->dev,
"CTRL LEN is configured incorrectly\n"); "CTRL LEN is configured incorrectly\n");
return -EINVAL; return -EINVAL;
} }
if ((chip_info->wait_state != SSP_MWIRE_WAIT_ZERO) if ((chip_info->wait_state != SSP_MWIRE_WAIT_ZERO)
&& (chip_info->wait_state != SSP_MWIRE_WAIT_ONE)) { && (chip_info->wait_state != SSP_MWIRE_WAIT_ONE)) {
dev_err(chip_info->dev, dev_err(&pl022->adev->dev,
"Wait State is configured incorrectly\n"); "Wait State is configured incorrectly\n");
return -EINVAL; return -EINVAL;
} }
@ -1658,13 +1658,13 @@ static int verify_controller_parameters(struct pl022 *pl022,
SSP_MICROWIRE_CHANNEL_FULL_DUPLEX) SSP_MICROWIRE_CHANNEL_FULL_DUPLEX)
&& (chip_info->duplex != && (chip_info->duplex !=
SSP_MICROWIRE_CHANNEL_HALF_DUPLEX)) { SSP_MICROWIRE_CHANNEL_HALF_DUPLEX)) {
dev_err(chip_info->dev, dev_err(&pl022->adev->dev,
"Microwire duplex mode is configured incorrectly\n"); "Microwire duplex mode is configured incorrectly\n");
return -EINVAL; return -EINVAL;
} }
} else { } else {
if (chip_info->duplex != SSP_MICROWIRE_CHANNEL_FULL_DUPLEX) if (chip_info->duplex != SSP_MICROWIRE_CHANNEL_FULL_DUPLEX)
dev_err(chip_info->dev, dev_err(&pl022->adev->dev,
"Microwire half duplex mode requested," "Microwire half duplex mode requested,"
" but this is only available in the" " but this is only available in the"
" ST version of PL022\n"); " ST version of PL022\n");
@ -1672,7 +1672,7 @@ static int verify_controller_parameters(struct pl022 *pl022,
} }
} }
if (chip_info->cs_control == NULL) { if (chip_info->cs_control == NULL) {
dev_warn(chip_info->dev, dev_warn(&pl022->adev->dev,
"Chip Select Function is NULL for this chip\n"); "Chip Select Function is NULL for this chip\n");
chip_info->cs_control = null_cs_control; chip_info->cs_control = null_cs_control;
} }
@ -1852,9 +1852,6 @@ static int pl022_setup(struct spi_device *spi)
"using user supplied controller_data settings\n"); "using user supplied controller_data settings\n");
} }
/* Pointer back to the SPI device */
chip_info->dev = &spi->dev;
/* /*
* We can override with custom divisors, else we use the board * We can override with custom divisors, else we use the board
* frequency setting * frequency setting

1
include/linux/amba/pl022.h
View File

@ -276,7 +276,6 @@ struct pl022_ssp_controller {
* @dma_config: DMA configuration for SSP controller and peripheral * @dma_config: DMA configuration for SSP controller and peripheral
*/ */
struct pl022_config_chip { struct pl022_config_chip {
struct device *dev;
enum ssp_interface iface; enum ssp_interface iface;
enum ssp_hierarchy hierarchy; enum ssp_hierarchy hierarchy;
bool slave_tx_disable; bool slave_tx_disable;