Merge remote-tracking branch 'omap/for-next'

[karo-tx-linux.git] / drivers / crypto / ccp / ccp-platform.c

diff --git a/drivers/crypto/ccp/ccp-platform.c b/drivers/crypto/ccp/ccp-platform.c
index bb241c3ab6b9cad5fec5ed22f4a9f96b5d7da551..8b923b7e9389aabd96ee10350c0f0ea9f66556f6 100644 (file)
--- a/drivers/crypto/ccp/ccp-platform.c
+++ b/drivers/crypto/ccp/ccp-platform.c
@@ -29,7 +29,6 @@
 #include "ccp-dev.h"
 
 struct ccp_platform {
-       int use_acpi;
        int coherent;
 };
 
@@ -95,7 +94,6 @@ static int ccp_platform_probe(struct platform_device *pdev)
        struct ccp_device *ccp;
        struct ccp_platform *ccp_platform;
        struct device *dev = &pdev->dev;
-       struct acpi_device *adev = ACPI_COMPANION(dev);
        struct resource *ior;
        int ret;
 
@@ -112,8 +110,6 @@ static int ccp_platform_probe(struct platform_device *pdev)
        ccp->get_irq = ccp_get_irqs;
        ccp->free_irq = ccp_free_irqs;
 
-       ccp_platform->use_acpi = (!adev || acpi_disabled) ? 0 : 1;
-
        ior = ccp_find_mmio_area(ccp);
        ccp->io_map = devm_ioremap_resource(dev, ior);
        if (IS_ERR(ccp->io_map)) {
@@ -229,7 +225,7 @@ MODULE_DEVICE_TABLE(of, ccp_of_match);
 
 static struct platform_driver ccp_platform_driver = {
        .driver = {
-               .name = "AMD Cryptographic Coprocessor",
+               .name = "ccp",
 #ifdef CONFIG_ACPI
                .acpi_match_table = ccp_acpi_match,
 #endif