Merge tag 'staging-5.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[linux-2.6-microblaze.git] / drivers / spi / spi-mt7621.c

diff --git a/drivers/spi/spi-mt7621.c b/drivers/spi/spi-mt7621.c
index ae83611..ff85982 100644 (file)
--- a/drivers/spi/spi-mt7621.c
+++ b/drivers/spi/spi-mt7621.c
@@ -57,8 +57,6 @@ struct mt7621_spi {
        unsigned int            speed;
        struct clk              *clk;
        int                     pending_write;
-
-       struct mt7621_spi_ops   *ops;
 };
 
 static inline struct mt7621_spi *spidev_to_mt7621_spi(struct spi_device *spi)
@@ -306,7 +304,7 @@ static int mt7621_spi_setup(struct spi_device *spi)
 
        if ((spi->max_speed_hz == 0) ||
            (spi->max_speed_hz > (rs->sys_freq / 2)))
-               spi->max_speed_hz = (rs->sys_freq / 2);
+               spi->max_speed_hz = rs->sys_freq / 2;
 
        if (spi->max_speed_hz < (rs->sys_freq / 4097)) {
                dev_err(&spi->dev, "setup: requested speed is too low %d Hz\n",
@@ -332,13 +330,11 @@ static int mt7621_spi_probe(struct platform_device *pdev)
        struct resource *r;
        int status = 0;
        struct clk *clk;
-       struct mt7621_spi_ops *ops;
        int ret;
 
        match = of_match_device(mt7621_spi_match, &pdev->dev);
        if (!match)
                return -EINVAL;
-       ops = (struct mt7621_spi_ops *)match->data;
 
        r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
        base = devm_ioremap_resource(&pdev->dev, r);
@@ -377,7 +373,6 @@ static int mt7621_spi_probe(struct platform_device *pdev)
        rs->clk = clk;
        rs->master = master;
        rs->sys_freq = clk_get_rate(rs->clk);
-       rs->ops = ops;
        rs->pending_write = 0;
        dev_info(&pdev->dev, "sys_freq: %u\n", rs->sys_freq);