ide: remove hw_regs_t typedef
Remove hw_regs_t typedef and rename struct hw_regs_s to struct ide_hw. There should be no functional changes caused by this patch. Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
@@ -301,11 +301,11 @@ static int ide_pci_check_iomem(struct pci_dev *dev, const struct ide_port_info *
|
||||
}
|
||||
|
||||
/**
|
||||
* ide_hw_configure - configure a hw_regs_t instance
|
||||
* ide_hw_configure - configure a struct ide_hw instance
|
||||
* @dev: PCI device holding interface
|
||||
* @d: IDE port info
|
||||
* @port: port number
|
||||
* @hw: hw_regs_t instance corresponding to this port
|
||||
* @hw: struct ide_hw instance corresponding to this port
|
||||
*
|
||||
* Perform the initial set up for the hardware interface structure. This
|
||||
* is done per interface port rather than per PCI device. There may be
|
||||
@@ -315,7 +315,7 @@ static int ide_pci_check_iomem(struct pci_dev *dev, const struct ide_port_info *
|
||||
*/
|
||||
|
||||
static int ide_hw_configure(struct pci_dev *dev, const struct ide_port_info *d,
|
||||
unsigned int port, hw_regs_t *hw)
|
||||
unsigned int port, struct ide_hw *hw)
|
||||
{
|
||||
unsigned long ctl = 0, base = 0;
|
||||
|
||||
@@ -445,8 +445,8 @@ out:
|
||||
* ide_pci_setup_ports - configure ports/devices on PCI IDE
|
||||
* @dev: PCI device
|
||||
* @d: IDE port info
|
||||
* @hw: hw_regs_t instances corresponding to this PCI IDE device
|
||||
* @hws: hw_regs_t pointers table to update
|
||||
* @hw: struct ide_hw instances corresponding to this PCI IDE device
|
||||
* @hws: struct ide_hw pointers table to update
|
||||
*
|
||||
* Scan the interfaces attached to this device and do any
|
||||
* necessary per port setup. Attach the devices and ask the
|
||||
@@ -458,7 +458,7 @@ out:
|
||||
*/
|
||||
|
||||
void ide_pci_setup_ports(struct pci_dev *dev, const struct ide_port_info *d,
|
||||
hw_regs_t *hw, hw_regs_t **hws)
|
||||
struct ide_hw *hw, struct ide_hw **hws)
|
||||
{
|
||||
int channels = (d->host_flags & IDE_HFLAG_SINGLE) ? 1 : 2, port;
|
||||
u8 tmp;
|
||||
@@ -538,7 +538,7 @@ int ide_pci_init_one(struct pci_dev *dev, const struct ide_port_info *d,
|
||||
void *priv)
|
||||
{
|
||||
struct ide_host *host;
|
||||
hw_regs_t hw[2], *hws[] = { NULL, NULL };
|
||||
struct ide_hw hw[2], *hws[] = { NULL, NULL };
|
||||
int ret;
|
||||
|
||||
ret = ide_setup_pci_controller(dev, d, 1);
|
||||
@@ -586,7 +586,7 @@ int ide_pci_init_two(struct pci_dev *dev1, struct pci_dev *dev2,
|
||||
struct pci_dev *pdev[] = { dev1, dev2 };
|
||||
struct ide_host *host;
|
||||
int ret, i;
|
||||
hw_regs_t hw[4], *hws[] = { NULL, NULL, NULL, NULL };
|
||||
struct ide_hw hw[4], *hws[] = { NULL, NULL, NULL, NULL };
|
||||
|
||||
for (i = 0; i < 2; i++) {
|
||||
ret = ide_setup_pci_controller(pdev[i], d, !i);
|
||||
|
Reference in New Issue
Block a user