Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261262AbUJWSNi (ORCPT ); Sat, 23 Oct 2004 14:13:38 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261265AbUJWSNi (ORCPT ); Sat, 23 Oct 2004 14:13:38 -0400 Received: from baikonur.stro.at ([213.239.196.228]:38344 "EHLO baikonur.stro.at") by vger.kernel.org with ESMTP id S261262AbUJWSNQ (ORCPT ); Sat, 23 Oct 2004 14:13:16 -0400 Date: Sat, 23 Oct 2004 20:13:13 +0200 From: maximilian attems To: Adrian Bunk Cc: linux-kernel@vger.kernel.org Subject: Re: [2.6 patch] SCSI aic7xxx: kill kernel 2.2 #ifdef's Message-ID: <20041023181313.GB3790@stro.at> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20041023163219.GF5110@stusta.de> User-Agent: Mutt/1.5.6+20040722i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 6187 Lines: 220 the kjt patchset has an similar patch, that got sent to James: the bits below were a leftover of a janitor patch removing aic7xxx and aic79xx old ifdefs. -- maks kernel janitor http://janitor.kernelnewbies.org/ From: Domen Puncer Patches to remove some old ifdefs. remove most of the #include kill compat cruft like #define ahd_pci_set_dma_mask pci_set_dma_mask Signed-off-by: Maximilian Attems --- linux-2.6.9-rc1-max/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c | 92 ------------- 1 files changed, 92 deletions(-) diff -puN drivers/scsi/aic7xxx/aic7xxx_osm_pci.c~remove-old-ifdefs-aic7xxx_osm_pci drivers/scsi/aic7xxx/aic7xxx_osm_pci.c --- linux-2.6.9-rc1/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c~remove-old-ifdefs-aic7xxx_osm_pci 2004-10-23 17:47:18.000000000 +0200 +++ linux-2.6.9-rc1-max/drivers/scsi/aic7xxx/aic7xxx_osm_pci.c 2004-10-23 17:49:13.000000000 +0200 @@ -42,12 +42,6 @@ #include "aic7xxx_osm.h" #include "aic7xxx_pci.h" -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0) -struct pci_device_id -{ -}; -#endif - static int ahc_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent); static int ahc_linux_pci_reserve_io_region(struct ahc_softc *ahc, @@ -55,7 +49,6 @@ static int ahc_linux_pci_reserve_io_regi static int ahc_linux_pci_reserve_mem_region(struct ahc_softc *ahc, u_long *bus_addr, uint8_t __iomem **maddr); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) static void ahc_linux_pci_dev_remove(struct pci_dev *pdev); /* Define the macro locally since it's different for different class of chips. @@ -169,7 +162,6 @@ ahc_linux_pci_dev_remove(struct pci_dev } else ahc_list_unlock(&l); } -#endif /* !LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0) */ static int ahc_linux_pci_dev_probe(struct pci_dev *pdev, const struct pci_device_id *ent) @@ -219,7 +211,6 @@ ahc_linux_pci_dev_probe(struct pci_dev * ahc = ahc_alloc(NULL, name); if (ahc == NULL) return (-ENOMEM); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) if (pci_enable_device(pdev)) { ahc_free(ahc); return (-ENODEV); @@ -239,57 +230,24 @@ ahc_linux_pci_dev_probe(struct pci_dev * } ahc->platform_data->hw_dma_mask = 0xFFFFFFFF; } -#endif ahc->dev_softc = pci; error = ahc_pci_config(ahc, entry); if (error != 0) { ahc_free(ahc); return (-error); } -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) pci_set_drvdata(pdev, ahc); if (aic7xxx_detect_complete) { -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0) ahc_linux_register_host(ahc, &aic7xxx_driver_template); -#else - printf("aic7xxx: ignoring PCI device found after " - "initialization\n"); - return (-ENODEV); -#endif } -#endif return (0); } int ahc_linux_pci_init(void) { -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) /* Translate error or zero return into zero or one */ return pci_module_init(&aic7xxx_pci_driver) ? 0 : 1; -#else - struct pci_dev *pdev; - u_int class; - int found; - - /* If we don't have a PCI bus, we can't find any adapters. */ - if (pci_present() == 0) - return (0); - - found = 0; - pdev = NULL; - class = PCI_CLASS_STORAGE_SCSI << 8; - while ((pdev = pci_find_class(class, pdev)) != NULL) { - ahc_dev_softc_t pci; - int error; - - pci = pdev; - error = ahc_linux_pci_dev_probe(pdev, /*pci_devid*/NULL); - if (error == 0) - found++; - } - return (found); -#endif } void @@ -304,22 +262,11 @@ ahc_linux_pci_reserve_io_region(struct a if (aic7xxx_allow_memio == 0) return (ENOMEM); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,3,0) *base = pci_resource_start(ahc->dev_softc, 0); -#else - *base = ahc_pci_read_config(ahc->dev_softc, PCIR_MAPS, 4); - *base &= PCI_BASE_ADDRESS_IO_MASK; -#endif if (*base == 0) return (ENOMEM); -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0) - if (check_region(*base, 256) != 0) - return (ENOMEM); - request_region(*base, 256, "aic7xxx"); -#else if (request_region(*base, 256, "aic7xxx") == 0) return (ENOMEM); -#endif return (0); } @@ -335,17 +282,13 @@ ahc_linux_pci_reserve_mem_region(struct start = pci_resource_start(ahc->dev_softc, 1); if (start != 0) { *bus_addr = start; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) if (request_mem_region(start, 0x1000, "aic7xxx") == 0) error = ENOMEM; -#endif if (error == 0) { *maddr = ioremap_nocache(start, 256); if (*maddr == NULL) { error = ENOMEM; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) release_mem_region(start, 0x1000); -#endif } } } else @@ -388,10 +331,8 @@ ahc_pci_map_registers(struct ahc_softc * ahc_get_pci_slot(ahc->dev_softc), ahc_get_pci_function(ahc->dev_softc)); iounmap(maddr); -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) release_mem_region(ahc->platform_data->mem_busaddr, 0x1000); -#endif ahc->bsh.maddr = NULL; maddr = NULL; } else @@ -444,38 +385,5 @@ ahc_pci_map_int(struct ahc_softc *ahc) void ahc_power_state_change(struct ahc_softc *ahc, ahc_power_state new_state) { -#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,0) pci_set_power_state(ahc->dev_softc, new_state); -#else - uint32_t cap; - u_int cap_offset; - - /* - * Traverse the capability list looking for - * the power management capability. - */ - cap = 0; - cap_offset = ahc_pci_read_config(ahc->dev_softc, - PCIR_CAP_PTR, /*bytes*/1); - while (cap_offset != 0) { - - cap = ahc_pci_read_config(ahc->dev_softc, - cap_offset, /*bytes*/4); - if ((cap & 0xFF) == 1 - && ((cap >> 16) & 0x3) > 0) { - uint32_t pm_control; - - pm_control = ahc_pci_read_config(ahc->dev_softc, - cap_offset + 4, - /*bytes*/4); - pm_control &= ~0x3; - pm_control |= new_state; - ahc_pci_write_config(ahc->dev_softc, - cap_offset + 4, - pm_control, /*bytes*/2); - break; - } - cap_offset = (cap >> 8) & 0xFF; - } -#endif } _ - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/