hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

spi/bcm63xx: remove unused speed_hz variable 

speed_hz is a write only member, so we can safely remove it and its
generation. Also fixes the missing clk_put after getting the periph
clock.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Jonas Gorski 2013-04-06 13:18:57 +02:00 committed by Mark Brown
parent 8b0bebe2c8
commit ab300d1817
3 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/mips/bcm63xx/dev-spi.c
View File

@ -85,20 +85,9 @@ static struct platform_device bcm63xx_spi_device = {
int __init bcm63xx_spi_register(void) int __init bcm63xx_spi_register(void)
{ {
struct clk *periph_clk;
if (BCMCPU_IS_6328() || BCMCPU_IS_6345()) if (BCMCPU_IS_6328() || BCMCPU_IS_6345())
return -ENODEV; return -ENODEV;
periph_clk = clk_get(NULL, "periph");
if (IS_ERR(periph_clk)) {
pr_err("unable to get periph clock\n");
return -ENODEV;
}
/* Set bus frequency */
spi_pdata.speed_hz = clk_get_rate(periph_clk);
spi_resources[0].start = bcm63xx_regset_address(RSET_SPI); spi_resources[0].start = bcm63xx_regset_address(RSET_SPI);
spi_resources[0].end = spi_resources[0].start; spi_resources[0].end = spi_resources[0].start;
spi_resources[1].start = bcm63xx_get_irq_number(IRQ_SPI); spi_resources[1].start = bcm63xx_get_irq_number(IRQ_SPI);

1
arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_spi.h
View File

@ -13,7 +13,6 @@ struct bcm63xx_spi_pdata {
unsigned int msg_ctl_width; unsigned int msg_ctl_width;
int bus_num; int bus_num;
int num_chipselect; int num_chipselect;
u32 speed_hz;
}; };
enum bcm63xx_regs_spi { enum bcm63xx_regs_spi {

2
drivers/spi/spi-bcm63xx.c
View File

@ -46,7 +46,6 @@ struct bcm63xx_spi {
int irq; int irq;
/* Platform data */ /* Platform data */
u32 speed_hz;
unsigned fifo_size; unsigned fifo_size;
unsigned int msg_type_shift; unsigned int msg_type_shift;
unsigned int msg_ctl_width; unsigned int msg_ctl_width;
@ -436,7 +435,6 @@ static int bcm63xx_spi_probe(struct platform_device *pdev)
master->unprepare_transfer_hardware = bcm63xx_spi_unprepare_transfer; master->unprepare_transfer_hardware = bcm63xx_spi_unprepare_transfer;
master->transfer_one_message = bcm63xx_spi_transfer_one; master->transfer_one_message = bcm63xx_spi_transfer_one;
master->mode_bits = MODEBITS; master->mode_bits = MODEBITS;
bs->speed_hz = pdata->speed_hz;
bs->msg_type_shift = pdata->msg_type_shift; bs->msg_type_shift = pdata->msg_type_shift;
bs->msg_ctl_width = pdata->msg_ctl_width; bs->msg_ctl_width = pdata->msg_ctl_width;
bs->tx_io = (u8 *)(bs->regs + bcm63xx_spireg(SPI_MSG_DATA)); bs->tx_io = (u8 *)(bs->regs + bcm63xx_spireg(SPI_MSG_DATA));