lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ide: remove ide_host_alloc_all()

Browse Source 
* Remove no longer used ide_host_alloc_all().

* Add MAX_HOST_PORTS define and use it instead of MAX_HWIFS
  as the maximum number of host ports possible.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz
2008-10-13 21:39:43 +02:00
parent cf4049103b
commit a36223b0dc
2 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/ide/ide-probe.c
View File

@@ -1544,8 +1544,7 @@ static void ide_free_port_slot(int idx)
mutex_unlock(&ide_cfg_mtx); mutex_unlock(&ide_cfg_mtx);
} }
struct ide_host *ide_host_alloc_all(const struct ide_port_info *d, struct ide_host *ide_host_alloc(const struct ide_port_info *d, hw_regs_t **hws)
hw_regs_t **hws)
{ {
struct ide_host *host; struct ide_host *host;
int i; int i;
@@ -1554,7 +1553,7 @@ struct ide_host *ide_host_alloc_all(const struct ide_port_info *d,
if (host == NULL) if (host == NULL)
return NULL; return NULL;
for (i = 0; i < MAX_HWIFS; i++) { for (i = 0; i < MAX_HOST_PORTS; i++) {
ide_hwif_t *hwif; ide_hwif_t *hwif;
int idx; int idx;
@@ -1596,18 +1595,6 @@ struct ide_host *ide_host_alloc_all(const struct ide_port_info *d,
return host; return host;
} }
EXPORT_SYMBOL_GPL(ide_host_alloc_all);
struct ide_host *ide_host_alloc(const struct ide_port_info *d, hw_regs_t **hws)
{
hw_regs_t *hws_all[MAX_HWIFS];
int i;
for (i = 0; i < MAX_HWIFS; i++)
hws_all[i] = (i < 4) ? hws[i] : NULL;
return ide_host_alloc_all(d, hws_all);
}
EXPORT_SYMBOL_GPL(ide_host_alloc); EXPORT_SYMBOL_GPL(ide_host_alloc);
int ide_host_register(struct ide_host *host, const struct ide_port_info *d, int ide_host_register(struct ide_host *host, const struct ide_port_info *d,
@@ -1616,7 +1603,7 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d,
ide_hwif_t *hwif, *mate = NULL; ide_hwif_t *hwif, *mate = NULL;
int i, j = 0; int i, j = 0;
for (i = 0; i < MAX_HWIFS; i++) { for (i = 0; i < MAX_HOST_PORTS; i++) {
hwif = host->ports[i]; hwif = host->ports[i];
if (hwif == NULL) { if (hwif == NULL) {
@@ -1644,7 +1631,7 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d,
ide_port_init_devices(hwif); ide_port_init_devices(hwif);
} }
for (i = 0; i < MAX_HWIFS; i++) { for (i = 0; i < MAX_HOST_PORTS; i++) {
hwif = host->ports[i]; hwif = host->ports[i];
if (hwif == NULL) if (hwif == NULL)
@@ -1661,7 +1648,7 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d,
ide_port_tune_devices(hwif); ide_port_tune_devices(hwif);
} }
for (i = 0; i < MAX_HWIFS; i++) { for (i = 0; i < MAX_HOST_PORTS; i++) {
hwif = host->ports[i]; hwif = host->ports[i];
if (hwif == NULL) if (hwif == NULL)
@@ -1685,7 +1672,7 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d,
ide_acpi_port_init_devices(hwif); ide_acpi_port_init_devices(hwif);
} }
for (i = 0; i < MAX_HWIFS; i++) { for (i = 0; i < MAX_HOST_PORTS; i++) {
hwif = host->ports[i]; hwif = host->ports[i];
if (hwif == NULL) if (hwif == NULL)
@@ -1698,7 +1685,7 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d,
hwif_register_devices(hwif); hwif_register_devices(hwif);
} }
for (i = 0; i < MAX_HWIFS; i++) { for (i = 0; i < MAX_HOST_PORTS; i++) {
hwif = host->ports[i]; hwif = host->ports[i];
if (hwif == NULL) if (hwif == NULL)
@@ -1743,7 +1730,7 @@ void ide_host_free(struct ide_host *host)
ide_hwif_t *hwif; ide_hwif_t *hwif;
int i; int i;
for (i = 0; i < MAX_HWIFS; i++) { for (i = 0; i < MAX_HOST_PORTS; i++) {
hwif = host->ports[i]; hwif = host->ports[i];
if (hwif == NULL) if (hwif == NULL)
@@ -1761,7 +1748,7 @@ void ide_host_remove(struct ide_host *host)
{ {
int i; int i;
for (i = 0; i < MAX_HWIFS; i++) { for (i = 0; i < MAX_HOST_PORTS; i++) {
if (host->ports[i]) if (host->ports[i])
ide_unregister(host->ports[i]); ide_unregister(host->ports[i]);
} }

5
include/linux/ide.h
View File

@@ -832,8 +832,10 @@ typedef struct hwif_s {
#endif #endif
} ____cacheline_internodealigned_in_smp ide_hwif_t; } ____cacheline_internodealigned_in_smp ide_hwif_t;
#define MAX_HOST_PORTS 4
struct ide_host { struct ide_host {
ide_hwif_t *ports[MAX_HWIFS]; ide_hwif_t *ports[MAX_HOST_PORTS];
unsigned int n_ports; unsigned int n_ports;
struct device *dev[2]; struct device *dev[2];
unsigned int (*init_chipset)(struct pci_dev *); unsigned int (*init_chipset)(struct pci_dev *);
@@ -1479,7 +1481,6 @@ void ide_undecoded_slave(ide_drive_t *);
void ide_port_apply_params(ide_hwif_t *); void ide_port_apply_params(ide_hwif_t *);
struct ide_host *ide_host_alloc_all(const struct ide_port_info *, hw_regs_t **);
struct ide_host *ide_host_alloc(const struct ide_port_info *, hw_regs_t **); struct ide_host *ide_host_alloc(const struct ide_port_info *, hw_regs_t **);
void ide_host_free(struct ide_host *); void ide_host_free(struct ide_host *);
int ide_host_register(struct ide_host *, const struct ide_port_info *, int ide_host_register(struct ide_host *, const struct ide_port_info *,