Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9270a3f authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

ide: move create_proc_ide_drives() call to ide_device_add_all() 



* Un-static create_proc_ide_drives() and call it from ide_device_add_all().

While at it:
* Rename create_proc_ide_drives() to ide_proc_port_register_devices().

Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 327617e1

drivers/ide/ide-probe.c

+3 −1
Original line number Diff line number Diff line
@@ -1453,8 +1453,10 @@ int ide_device_add_all(u8 *idx, const struct ide_port_info *d) 


		hwif = &ide_hwifs[idx[i]];



		if (hwif->present)

		if (hwif->present) {

			ide_proc_register_port(hwif);

			ide_proc_port_register_devices(hwif);

		}

	}



	return rc;

drivers/ide/ide-proc.c

+1 −3
Original line number Diff line number Diff line
@@ -739,7 +739,7 @@ void ide_proc_unregister_driver(ide_drive_t *drive, ide_driver_t *driver) 


EXPORT_SYMBOL(ide_proc_unregister_driver);



static void create_proc_ide_drives(ide_hwif_t *hwif)

void ide_proc_port_register_devices(ide_hwif_t *hwif)

{

	int	d;

	struct proc_dir_entry *ent;
@@ -801,8 +801,6 @@ void ide_proc_register_port(ide_hwif_t *hwif) 


		ide_add_proc_entries(hwif->proc, hwif_entries, hwif);

	}



	create_proc_ide_drives(hwif);

}



#ifdef CONFIG_BLK_DEV_IDEPCI

include/linux/ide.h

+2 −0
Original line number Diff line number Diff line
@@ -715,6 +715,7 @@ typedef struct { 
void proc_ide_create(void);

void proc_ide_destroy(void);

void ide_proc_register_port(ide_hwif_t *);

void ide_proc_port_register_devices(ide_hwif_t *);

void ide_proc_unregister_port(ide_hwif_t *);

void ide_proc_register_driver(ide_drive_t *, ide_driver_t *);

void ide_proc_unregister_driver(ide_drive_t *, ide_driver_t *);
@@ -747,6 +748,7 @@ void ide_pci_create_host_proc(const char *, get_info_t *); 
static inline void proc_ide_create(void) { ; }

static inline void proc_ide_destroy(void) { ; }

static inline void ide_proc_register_port(ide_hwif_t *hwif) { ; }

static inline void ide_proc_port_register_devices(ide_hwif_t *hwif) { ; }

static inline void ide_proc_unregister_port(ide_hwif_t *hwif) { ; }

static inline void ide_proc_register_driver(ide_drive_t *drive, ide_driver_t *driver) { ; }

static inline void ide_proc_unregister_driver(ide_drive_t *drive, ide_driver_t *driver) { ; }