Merge branch 'audit.b50' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit...

[karo-tx-linux.git] / drivers / pci / hotplug / cpqphp_nvram.c

diff --git a/drivers/pci/hotplug/cpqphp_nvram.c b/drivers/pci/hotplug/cpqphp_nvram.c
index ac98a11bd1ebca08cb2ebe7977d75f227dd90803..cb174888002ba537ee2884a46fcac24513f1b1fe 100644 (file)
--- a/drivers/pci/hotplug/cpqphp_nvram.c
+++ b/drivers/pci/hotplug/cpqphp_nvram.c
@@ -26,7 +26,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
@@ -34,6 +33,7 @@
 #include <linux/slab.h>
 #include <linux/workqueue.h>
 #include <linux/pci.h>
+#include <linux/pci_hotplug.h>
 #include <linux/init.h>
 #include <asm/uaccess.h>
 #include "cpqphp.h"
@@ -160,7 +160,7 @@ static int check_for_compaq_ROM (void __iomem *rom_start)
            (temp6 == 'Q')) {
                result = 1;
        }
-       dbg ("%s - returned %d\n", __FUNCTION__, result);
+       dbg ("%s - returned %d\n", __func__, result);
        return result;
 }
 
@@ -520,7 +520,7 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
                        return 2;
 
                while (nummem--) {
-                       mem_node = (struct pci_resource*) kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
+                       mem_node = kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
 
                        if (!mem_node)
                                break;
@@ -548,7 +548,7 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
                }
 
                while (numpmem--) {
-                       p_mem_node = (struct pci_resource*) kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
+                       p_mem_node = kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
 
                        if (!p_mem_node)
                                break;
@@ -576,7 +576,7 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
                }
 
                while (numio--) {
-                       io_node = (struct pci_resource*) kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
+                       io_node = kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
 
                        if (!io_node)
                                break;
@@ -604,7 +604,7 @@ int compaq_nvram_load (void __iomem *rom_start, struct controller *ctrl)
                }
 
                while (numbus--) {
-                       bus_node = (struct pci_resource*) kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
+                       bus_node = kmalloc(sizeof(struct pci_resource), GFP_KERNEL);
 
                        if (!bus_node)
                                break;