Skip to content

Commit

Permalink
ide: make ide_hwifs[] static
Browse files Browse the repository at this point in the history
Move ide_hwifs[] from ide.c to ide-probe.c and make it static.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
  • Loading branch information
Bartlomiej Zolnierkiewicz committed Jul 16, 2008
1 parent 256c5f8 commit 63b51c6
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 14 deletions.
2 changes: 2 additions & 0 deletions drivers/ide/ide-probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@
#include <asm/uaccess.h>
#include <asm/io.h>

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
Expand Down
2 changes: 0 additions & 2 deletions drivers/ide/ide.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 *);

/*
Expand Down
12 changes: 0 additions & 12 deletions include/linux/ide.h
Original file line number Diff line number Diff line change
Expand Up @@ -801,18 +801,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;

Expand Down

0 comments on commit 63b51c6

Please sign in to comment.