From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763628AbYCXSjn (ORCPT ); Mon, 24 Mar 2008 14:39:43 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1762988AbYCXSit (ORCPT ); Mon, 24 Mar 2008 14:38:49 -0400 Received: from fg-out-1718.google.com ([72.14.220.155]:36760 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762940AbYCXSis (ORCPT ); Mon, 24 Mar 2008 14:38:48 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=from:to:cc:date:message-id:in-reply-to:references:subject; b=EjmR4JoLDDPNaNCL1wRh6z2sAoJyk46uIuov8FtHH/SxY7i6bKEbkNJiFt2VaJdSZ1EjkTfcjIbI3rZQjoR93N6ncuLJHdLGDNj440Jp5E7XgNF6yXkP/zjJCTRpz7tIcNkHQmylDgkPZ8wFL3sOPPSYY2MmyCyrombFSJDSVkg= From: Bartlomiej Zolnierkiewicz To: linux-ide@vger.kernel.org Cc: Bartlomiej Zolnierkiewicz , linux-kernel@vger.kernel.org Date: Mon, 24 Mar 2008 19:53:51 +0100 Message-Id: <20080324185351.15320.58464.sendpatchset@localhost.localdomain> In-Reply-To: <20080324185324.15320.23248.sendpatchset@localhost.localdomain> References: <20080324185324.15320.23248.sendpatchset@localhost.localdomain> Subject: [PATCH 5/5] ide: make ide_hwifs[] static Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Move ide_hwifs[] from ide.c to ide-probe.c and make it static. Signed-off-by: Bartlomiej Zolnierkiewicz --- drivers/ide/ide-probe.c | 2 ++ drivers/ide/ide.c | 2 -- include/linux/ide.h | 12 ------------ 3 files changed, 2 insertions(+), 14 deletions(-) Index: b/drivers/ide/ide-probe.c =================================================================== --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c @@ -39,6 +39,8 @@ #include #include +static ide_hwif_t ide_hwifs[MAX_HWIFS]; /* master data repository */ + /** * generic_id - add a generic drive id * @drive: drive to make an ID block for Index: b/drivers/ide/ide.c =================================================================== --- a/drivers/ide/ide.c +++ b/drivers/ide/ide.c @@ -91,8 +91,6 @@ DEFINE_MUTEX(ide_cfg_mtx); __cacheline_aligned_in_smp DEFINE_SPINLOCK(ide_lock); EXPORT_SYMBOL(ide_lock); -ide_hwif_t ide_hwifs[MAX_HWIFS]; /* master data repository */ - static void ide_port_init_devices_data(ide_hwif_t *); /* Index: b/include/linux/ide.h =================================================================== --- a/include/linux/ide.h +++ b/include/linux/ide.h @@ -788,18 +788,6 @@ struct ide_driver_s { int generic_ide_ioctl(ide_drive_t *, struct file *, struct block_device *, unsigned, unsigned long); -/* - * ide_hwifs[] is the master data structure used to keep track - * of just about everything in ide.c. Whenever possible, routines - * should be using pointers to a drive (ide_drive_t *) or - * pointers to a hwif (ide_hwif_t *), rather than indexing this - * structure directly (the allocation/layout may change!). - * - */ -#ifndef _IDE_C -extern ide_hwif_t ide_hwifs[]; /* master data repository */ -#endif - extern int ide_vlb_clk; extern int ide_pci_clk;