From: Adrian Bunk This patch contains the following cleanups: - make cpqarray_pci_device_id static - merge cpqarray_init_step2 into cpqarray_init and make it static Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton --- 25-akpm/drivers/block/cpqarray.c | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff -puN drivers/block/cpqarray.c~drivers-block-cpqarrayc-small-cleanups drivers/block/cpqarray.c --- 25/drivers/block/cpqarray.c~drivers-block-cpqarrayc-small-cleanups 2005-01-25 21:27:15.756585256 -0800 +++ 25-akpm/drivers/block/cpqarray.c 2005-01-25 21:27:15.761584496 -0800 @@ -97,7 +97,7 @@ static struct board_type products[] = { }; /* define the PCI info for the PCI cards this driver can control */ -const struct pci_device_id cpqarray_pci_device_id[] = +static const struct pci_device_id cpqarray_pci_device_id[] = { { PCI_VENDOR_ID_DEC, PCI_DEVICE_ID_COMPAQ_42XX, 0x0E11, 0x4058, 0, 0, 0}, /* SA431 */ @@ -135,7 +135,6 @@ static struct gendisk *ida_gendisk[MAX_C /* Debug Extra Paranoid... */ #define DBGPX(s) do { } while(0) -int cpqarray_init_step2(void); static int cpqarray_pci_init(ctlr_info_t *c, struct pci_dev *pdev); static void __iomem *remap_pci_mem(ulong base, ulong size); static int cpqarray_eisa_detect(void); @@ -312,14 +311,6 @@ static int ida_proc_get_info(char *buffe module_param_array(eisa, int, NULL, 0); -/* This is a bit of a hack, - * necessary to support both eisa and pci - */ -int __init cpqarray_init(void) -{ - return (cpqarray_init_step2()); -} - static void release_io_mem(ctlr_info_t *c) { /* if IO mem was not protected do nothing */ @@ -560,7 +551,7 @@ static struct pci_driver cpqarray_pci_dr * This is it. Find all the controllers and register them. * returns the number of block devices registered. */ -int __init cpqarray_init_step2(void) +static int __init cpqarray_init(void) { int num_cntlrs_reg = 0; int i; _