libata: dev_config does not need ap and adev passing
It used to be impossible to get from ata_device to ata_port but that is no longer true. Various methods have been cleaned up over time but dev_config still takes both and most users don't need both anyway. Tidy this one up Signed-off-by: Alan Cox <alan@redhat.com> Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
parent
d88184fb23
commit
cd0d3bbcdd
|
@ -1792,7 +1792,7 @@ int ata_dev_configure(struct ata_device *dev)
|
||||||
dev->horkage |= ATA_HORKAGE_DMA_RW_ONLY;
|
dev->horkage |= ATA_HORKAGE_DMA_RW_ONLY;
|
||||||
|
|
||||||
if (ap->ops->dev_config)
|
if (ap->ops->dev_config)
|
||||||
ap->ops->dev_config(ap, dev);
|
ap->ops->dev_config(dev);
|
||||||
|
|
||||||
if (ata_msg_probe(ap))
|
if (ata_msg_probe(ap))
|
||||||
ata_dev_printk(dev, KERN_DEBUG, "%s: EXIT, drv_stat = 0x%x\n",
|
ata_dev_printk(dev, KERN_DEBUG, "%s: EXIT, drv_stat = 0x%x\n",
|
||||||
|
|
|
@ -324,7 +324,7 @@ static void ali_set_dmamode(struct ata_port *ap, struct ata_device *adev)
|
||||||
* slower PIO methods
|
* slower PIO methods
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static void ali_lock_sectors(struct ata_port *ap, struct ata_device *adev)
|
static void ali_lock_sectors(struct ata_device *adev)
|
||||||
{
|
{
|
||||||
adev->max_sectors = 255;
|
adev->max_sectors = 255;
|
||||||
}
|
}
|
||||||
|
|
|
@ -520,7 +520,6 @@ static int it821x_smart_set_mode(struct ata_port *ap, struct ata_device **unused
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* it821x_dev_config - Called each device identify
|
* it821x_dev_config - Called each device identify
|
||||||
* @ap: ATA port
|
|
||||||
* @adev: Device that has just been identified
|
* @adev: Device that has just been identified
|
||||||
*
|
*
|
||||||
* Perform the initial setup needed for each device that is chip
|
* Perform the initial setup needed for each device that is chip
|
||||||
|
@ -531,7 +530,7 @@ static int it821x_smart_set_mode(struct ata_port *ap, struct ata_device **unused
|
||||||
* basically we need to filter commands for this chip.
|
* basically we need to filter commands for this chip.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static void it821x_dev_config(struct ata_port *ap, struct ata_device *adev)
|
static void it821x_dev_config(struct ata_device *adev)
|
||||||
{
|
{
|
||||||
unsigned char model_num[ATA_ID_PROD_LEN + 1];
|
unsigned char model_num[ATA_ID_PROD_LEN + 1];
|
||||||
|
|
||||||
|
|
|
@ -244,7 +244,6 @@ static void pdc2026x_bmdma_stop(struct ata_queued_cmd *qc)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* pdc2026x_dev_config - device setup hook
|
* pdc2026x_dev_config - device setup hook
|
||||||
* @ap: ATA port
|
|
||||||
* @adev: newly found device
|
* @adev: newly found device
|
||||||
*
|
*
|
||||||
* Perform chip specific early setup. We need to lock the transfer
|
* Perform chip specific early setup. We need to lock the transfer
|
||||||
|
@ -252,7 +251,7 @@ static void pdc2026x_bmdma_stop(struct ata_queued_cmd *qc)
|
||||||
* barf.
|
* barf.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
static void pdc2026x_dev_config(struct ata_port *ap, struct ata_device *adev)
|
static void pdc2026x_dev_config(struct ata_device *adev)
|
||||||
{
|
{
|
||||||
adev->max_sectors = 256;
|
adev->max_sectors = 256;
|
||||||
}
|
}
|
||||||
|
|
|
@ -492,7 +492,7 @@ static void inic_post_internal_cmd(struct ata_queued_cmd *qc)
|
||||||
inic_reset_port(inic_port_base(qc->ap));
|
inic_reset_port(inic_port_base(qc->ap));
|
||||||
}
|
}
|
||||||
|
|
||||||
static void inic_dev_config(struct ata_port *ap, struct ata_device *dev)
|
static void inic_dev_config(struct ata_device *dev)
|
||||||
{
|
{
|
||||||
/* inic can only handle upto LBA28 max sectors */
|
/* inic can only handle upto LBA28 max sectors */
|
||||||
if (dev->max_sectors > ATA_MAX_SECTORS)
|
if (dev->max_sectors > ATA_MAX_SECTORS)
|
||||||
|
|
|
@ -114,7 +114,7 @@ static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
|
||||||
#ifdef CONFIG_PM
|
#ifdef CONFIG_PM
|
||||||
static int sil_pci_device_resume(struct pci_dev *pdev);
|
static int sil_pci_device_resume(struct pci_dev *pdev);
|
||||||
#endif
|
#endif
|
||||||
static void sil_dev_config(struct ata_port *ap, struct ata_device *dev);
|
static void sil_dev_config(struct ata_device *dev);
|
||||||
static u32 sil_scr_read (struct ata_port *ap, unsigned int sc_reg);
|
static u32 sil_scr_read (struct ata_port *ap, unsigned int sc_reg);
|
||||||
static void sil_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
|
static void sil_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
|
||||||
static void sil_post_set_mode (struct ata_port *ap);
|
static void sil_post_set_mode (struct ata_port *ap);
|
||||||
|
@ -521,7 +521,6 @@ static void sil_thaw(struct ata_port *ap)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* sil_dev_config - Apply device/host-specific errata fixups
|
* sil_dev_config - Apply device/host-specific errata fixups
|
||||||
* @ap: Port containing device to be examined
|
|
||||||
* @dev: Device to be examined
|
* @dev: Device to be examined
|
||||||
*
|
*
|
||||||
* After the IDENTIFY [PACKET] DEVICE step is complete, and a
|
* After the IDENTIFY [PACKET] DEVICE step is complete, and a
|
||||||
|
@ -548,8 +547,9 @@ static void sil_thaw(struct ata_port *ap)
|
||||||
* appreciated.
|
* appreciated.
|
||||||
* - But then again UDMA5 is hardly anything to complain about
|
* - But then again UDMA5 is hardly anything to complain about
|
||||||
*/
|
*/
|
||||||
static void sil_dev_config(struct ata_port *ap, struct ata_device *dev)
|
static void sil_dev_config(struct ata_device *dev)
|
||||||
{
|
{
|
||||||
|
struct ata_port *ap = dev->ap;
|
||||||
int print_info = ap->eh_context.i.flags & ATA_EHI_PRINTINFO;
|
int print_info = ap->eh_context.i.flags & ATA_EHI_PRINTINFO;
|
||||||
unsigned int n, quirks = 0;
|
unsigned int n, quirks = 0;
|
||||||
unsigned char model_num[ATA_ID_PROD_LEN + 1];
|
unsigned char model_num[ATA_ID_PROD_LEN + 1];
|
||||||
|
|
|
@ -323,7 +323,7 @@ struct sil24_port_priv {
|
||||||
struct ata_taskfile tf; /* Cached taskfile registers */
|
struct ata_taskfile tf; /* Cached taskfile registers */
|
||||||
};
|
};
|
||||||
|
|
||||||
static void sil24_dev_config(struct ata_port *ap, struct ata_device *dev);
|
static void sil24_dev_config(struct ata_device *dev);
|
||||||
static u8 sil24_check_status(struct ata_port *ap);
|
static u8 sil24_check_status(struct ata_port *ap);
|
||||||
static u32 sil24_scr_read(struct ata_port *ap, unsigned sc_reg);
|
static u32 sil24_scr_read(struct ata_port *ap, unsigned sc_reg);
|
||||||
static void sil24_scr_write(struct ata_port *ap, unsigned sc_reg, u32 val);
|
static void sil24_scr_write(struct ata_port *ap, unsigned sc_reg, u32 val);
|
||||||
|
@ -462,9 +462,9 @@ static int sil24_tag(int tag)
|
||||||
return tag;
|
return tag;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void sil24_dev_config(struct ata_port *ap, struct ata_device *dev)
|
static void sil24_dev_config(struct ata_device *dev)
|
||||||
{
|
{
|
||||||
void __iomem *port = ap->ioaddr.cmd_addr;
|
void __iomem *port = dev->ap->ioaddr.cmd_addr;
|
||||||
|
|
||||||
if (dev->cdb_len == 16)
|
if (dev->cdb_len == 16)
|
||||||
writel(PORT_CS_CDB16, port + PORT_CTRL_STAT);
|
writel(PORT_CS_CDB16, port + PORT_CTRL_STAT);
|
||||||
|
|
|
@ -597,7 +597,7 @@ struct ata_port {
|
||||||
struct ata_port_operations {
|
struct ata_port_operations {
|
||||||
void (*port_disable) (struct ata_port *);
|
void (*port_disable) (struct ata_port *);
|
||||||
|
|
||||||
void (*dev_config) (struct ata_port *, struct ata_device *);
|
void (*dev_config) (struct ata_device *);
|
||||||
|
|
||||||
void (*set_piomode) (struct ata_port *, struct ata_device *);
|
void (*set_piomode) (struct ata_port *, struct ata_device *);
|
||||||
void (*set_dmamode) (struct ata_port *, struct ata_device *);
|
void (*set_dmamode) (struct ata_port *, struct ata_device *);
|
||||||
|
|
Loading…
Reference in a new issue