ide: make ide_hwifs[] static (63b51c6d) · Commits · 戴 / test

drivers/ide/ide-probe.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -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

+0 −2

Original line number	Diff line number	Diff line
		@@ -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 *);

		/*

+0 −12

Original line number	Diff line number	Diff line
		@@ -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;