Merge branch 'late/cleanup' into devel-late

[karo-tx-linux.git] / drivers / spi / spi-topcliff-pch.c

diff --git a/drivers/spi/spi-topcliff-pch.c b/drivers/spi/spi-topcliff-pch.c
index ec47d3bdfd13233b68774e59fedf6b77570c3c16..cd56dcf46320bb57f598ac50321c214d6133824c 100644 (file)
--- a/drivers/spi/spi-topcliff-pch.c
+++ b/drivers/spi/spi-topcliff-pch.c
@@ -1438,7 +1438,6 @@ static int __devinit pch_spi_pd_probe(struct platform_device *plat_dev)
                plat_dev->id, data->io_remap_addr);
 
        /* initialize members of SPI master */
-       master->bus_num = -1;
        master->num_chipselect = PCH_MAX_CS;
        master->setup = pch_spi_setup;
        master->transfer = pch_spi_transfer;
@@ -1779,7 +1778,7 @@ static struct pci_driver pch_spi_pcidev_driver = {
        .name = "pch_spi",
        .id_table = pch_spi_pcidev_id,
        .probe = pch_spi_probe,
-       .remove = pch_spi_remove,
+       .remove = __devexit_p(pch_spi_remove),
        .suspend = pch_spi_suspend,
        .resume = pch_spi_resume,
 };