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

Commit f6d950e2 authored by Brian King's avatar Brian King Committed by Jeff Garzik
Browse files

[PATCH] libata: Move ata_probe_ent_alloc to libata_core 



Move ata_probe_ent_alloc to libata-core. It will also be used by
future SAS/SATA integration patches.

Signed-off-by: default avatarBrian King <brking@us.ibm.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 155a8a9c

drivers/scsi/libata-bmdma.c

+0 −26
Original line number Diff line number Diff line
@@ -797,32 +797,6 @@ void ata_bmdma_post_internal_cmd(struct ata_queued_cmd *qc) 
}



#ifdef CONFIG_PCI

static struct ata_probe_ent *

ata_probe_ent_alloc(struct device *dev, const struct ata_port_info *port)

{

	struct ata_probe_ent *probe_ent;



	probe_ent = kzalloc(sizeof(*probe_ent), GFP_KERNEL);

	if (!probe_ent) {

		printk(KERN_ERR DRV_NAME "(%s): out of memory\n",

		       kobject_name(&(dev->kobj)));

		return NULL;

	}



	INIT_LIST_HEAD(&probe_ent->node);

	probe_ent->dev = dev;



	probe_ent->sht = port->sht;

	probe_ent->host_flags = port->host_flags;

	probe_ent->pio_mask = port->pio_mask;

	probe_ent->mwdma_mask = port->mwdma_mask;

	probe_ent->udma_mask = port->udma_mask;

	probe_ent->port_ops = port->port_ops;



	return probe_ent;

}





/**

 *	ata_pci_init_native_mode - Initialize native-mode driver

 *	@pdev:  pci device to be initialized

drivers/scsi/libata-core.c

+25 −0
Original line number Diff line number Diff line
@@ -5688,6 +5688,31 @@ int ata_scsi_release(struct Scsi_Host *host) 
	return 1;

}



struct ata_probe_ent *

ata_probe_ent_alloc(struct device *dev, const struct ata_port_info *port)

{

	struct ata_probe_ent *probe_ent;



	probe_ent = kzalloc(sizeof(*probe_ent), GFP_KERNEL);

	if (!probe_ent) {

		printk(KERN_ERR DRV_NAME "(%s): out of memory\n",

		       kobject_name(&(dev->kobj)));

		return NULL;

	}



	INIT_LIST_HEAD(&probe_ent->node);

	probe_ent->dev = dev;



	probe_ent->sht = port->sht;

	probe_ent->host_flags = port->host_flags;

	probe_ent->pio_mask = port->pio_mask;

	probe_ent->mwdma_mask = port->mwdma_mask;

	probe_ent->udma_mask = port->udma_mask;

	probe_ent->port_ops = port->port_ops;



	return probe_ent;

}



/**

 *	ata_std_ports - initialize ioaddr with standard port offsets.

 *	@ioaddr: IO address structure to be initialized

drivers/scsi/libata.h

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ extern int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg); 
extern int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg);

extern void ata_port_init(struct ata_port *ap, struct ata_host_set *host_set,

			  const struct ata_probe_ent *ent, unsigned int port_no);

extern struct ata_probe_ent *ata_probe_ent_alloc(struct device *dev,

						 const struct ata_port_info *port);





/* libata-scsi.c */