]> err.no Git - linux-2.6/commitdiff
[IA64] Replace kcalloc(1, with kzalloc.
authorPanagiotis Issaris <takis@issaris.org>
Wed, 9 Nov 2005 01:08:42 +0000 (02:08 +0100)
committerTony Luck <tony.luck@intel.com>
Thu, 10 Nov 2005 19:28:20 +0000 (11:28 -0800)
Conversion from kcalloc(1, to kzalloc.

Signed-off-by: Panagiotis Issaris <takis@issaris.org>
Signed-off-by: Tony Luck <tony.luck@intel.com>
arch/ia64/kernel/efi.c
arch/ia64/sn/kernel/io_init.c
arch/ia64/sn/pci/tioce_provider.c

index f72ea6aebcb15bb3bf0213ff0d1829863c8e418d..a3aa45cbcfa03e460dab2d8696259126688407fb 100644 (file)
@@ -987,7 +987,7 @@ efi_initialize_iomem_resources(struct resource *code_resource,
                                break;
                }
 
-               if ((res = kcalloc(1, sizeof(struct resource), GFP_KERNEL)) == NULL) {
+               if ((res = kzalloc(sizeof(struct resource), GFP_KERNEL)) == NULL) {
                        printk(KERN_ERR "failed to alocate resource for iomem\n");
                        return;
                }
index b4f5053f5e1be852a05d8c64ab845ca5719c91e2..05e4ea8899818f8bc06cff895246a3cd55906bbe 100644 (file)
@@ -349,7 +349,7 @@ void sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
                return;         /*bus # does not exist */
        prom_bussoft_ptr = __va(prom_bussoft_ptr);
 
-       controller = kcalloc(1,sizeof(struct pci_controller), GFP_KERNEL);
+       controller = kzalloc(sizeof(struct pci_controller), GFP_KERNEL);
        controller->segment = segment;
        if (!controller)
                BUG();
index 9f03d4e5121c62f92791af2b2384e98e32d2b8c4..dda196c9e324e3c8056bc77cb666b5b64397b7e0 100644 (file)
@@ -218,7 +218,7 @@ tioce_alloc_map(struct tioce_kernel *ce_kern, int type, int port,
        if (i > last)
                return 0;
 
-       map = kcalloc(1, sizeof(struct tioce_dmamap), GFP_ATOMIC);
+       map = kzalloc(sizeof(struct tioce_dmamap), GFP_ATOMIC);
        if (!map)
                return 0;
 
@@ -555,7 +555,7 @@ tioce_kern_init(struct tioce_common *tioce_common)
        struct tioce *tioce_mmr;
        struct tioce_kernel *tioce_kern;
 
-       tioce_kern = kcalloc(1, sizeof(struct tioce_kernel), GFP_KERNEL);
+       tioce_kern = kzalloc(sizeof(struct tioce_kernel), GFP_KERNEL);
        if (!tioce_kern) {
                return NULL;
        }
@@ -727,7 +727,7 @@ tioce_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
         * Allocate kernel bus soft and copy from prom.
         */
 
-       tioce_common = kcalloc(1, sizeof(struct tioce_common), GFP_KERNEL);
+       tioce_common = kzalloc(sizeof(struct tioce_common), GFP_KERNEL);
        if (!tioce_common)
                return NULL;