aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan <alan@lxorguk.ukuu.org.uk>2007-03-01 19:56:15 -0500
committerJeff Garzik <jeff@garzik.org>2007-04-28 14:15:55 -0400
commitcd0d3bbcdd650651b7ccfaf55d107e3fc237d95a (patch)
tree9c095bdb9056f5b36d3d3640a3f497cabfdd1f92
parentd88184fb2348a50f7c34f5d49a901c875b2e0114 (diff)
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>
-rw-r--r--drivers/ata/libata-core.c2
-rw-r--r--drivers/ata/pata_ali.c2
-rw-r--r--drivers/ata/pata_it821x.c3
-rw-r--r--drivers/ata/pata_pdc202xx_old.c3
-rw-r--r--drivers/ata/sata_inic162x.c2
-rw-r--r--drivers/ata/sata_sil.c6
-rw-r--r--drivers/ata/sata_sil24.c6
-rw-r--r--include/linux/libata.h2
8 files changed, 12 insertions, 14 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index e7ad13d43c9f..2b998b321881 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -1792,7 +1792,7 @@ int ata_dev_configure(struct ata_device *dev)
1792 dev->horkage |= ATA_HORKAGE_DMA_RW_ONLY; 1792 dev->horkage |= ATA_HORKAGE_DMA_RW_ONLY;
1793 1793
1794 if (ap->ops->dev_config) 1794 if (ap->ops->dev_config)
1795 ap->ops->dev_config(ap, dev); 1795 ap->ops->dev_config(dev);
1796 1796
1797 if (ata_msg_probe(ap)) 1797 if (ata_msg_probe(ap))
1798 ata_dev_printk(dev, KERN_DEBUG, "%s: EXIT, drv_stat = 0x%x\n", 1798 ata_dev_printk(dev, KERN_DEBUG, "%s: EXIT, drv_stat = 0x%x\n",
diff --git a/drivers/ata/pata_ali.c b/drivers/ata/pata_ali.c
index 11ea552a58ca..76243400c01d 100644
--- a/drivers/ata/pata_ali.c
+++ b/drivers/ata/pata_ali.c
@@ -324,7 +324,7 @@ static void ali_set_dmamode(struct ata_port *ap, struct ata_device *adev)
324 * slower PIO methods 324 * slower PIO methods
325 */ 325 */
326 326
327static void ali_lock_sectors(struct ata_port *ap, struct ata_device *adev) 327static void ali_lock_sectors(struct ata_device *adev)
328{ 328{
329 adev->max_sectors = 255; 329 adev->max_sectors = 255;
330} 330}
diff --git a/drivers/ata/pata_it821x.c b/drivers/ata/pata_it821x.c
index 35ecb2ba067b..be8c9ef8d0d4 100644
--- a/drivers/ata/pata_it821x.c
+++ b/drivers/ata/pata_it821x.c
@@ -520,7 +520,6 @@ static int it821x_smart_set_mode(struct ata_port *ap, struct ata_device **unused
520 520
521/** 521/**
522 * it821x_dev_config - Called each device identify 522 * it821x_dev_config - Called each device identify
523 * @ap: ATA port
524 * @adev: Device that has just been identified 523 * @adev: Device that has just been identified
525 * 524 *
526 * Perform the initial setup needed for each device that is chip 525 * 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
531 * basically we need to filter commands for this chip. 530 * basically we need to filter commands for this chip.
532 */ 531 */
533 532
534static void it821x_dev_config(struct ata_port *ap, struct ata_device *adev) 533static void it821x_dev_config(struct ata_device *adev)
535{ 534{
536 unsigned char model_num[ATA_ID_PROD_LEN + 1]; 535 unsigned char model_num[ATA_ID_PROD_LEN + 1];
537 536
diff --git a/drivers/ata/pata_pdc202xx_old.c b/drivers/ata/pata_pdc202xx_old.c
index 0a1493398913..a764ce8252aa 100644
--- a/drivers/ata/pata_pdc202xx_old.c
+++ b/drivers/ata/pata_pdc202xx_old.c
@@ -244,7 +244,6 @@ static void pdc2026x_bmdma_stop(struct ata_queued_cmd *qc)
244 244
245/** 245/**
246 * pdc2026x_dev_config - device setup hook 246 * pdc2026x_dev_config - device setup hook
247 * @ap: ATA port
248 * @adev: newly found device 247 * @adev: newly found device
249 * 248 *
250 * Perform chip specific early setup. We need to lock the transfer 249 * 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)
252 * barf. 251 * barf.
253 */ 252 */
254 253
255static void pdc2026x_dev_config(struct ata_port *ap, struct ata_device *adev) 254static void pdc2026x_dev_config(struct ata_device *adev)
256{ 255{
257 adev->max_sectors = 256; 256 adev->max_sectors = 256;
258} 257}
diff --git a/drivers/ata/sata_inic162x.c b/drivers/ata/sata_inic162x.c
index 1e21688bfcf2..4f5a6a1fb0ed 100644
--- a/drivers/ata/sata_inic162x.c
+++ b/drivers/ata/sata_inic162x.c
@@ -492,7 +492,7 @@ static void inic_post_internal_cmd(struct ata_queued_cmd *qc)
492 inic_reset_port(inic_port_base(qc->ap)); 492 inic_reset_port(inic_port_base(qc->ap));
493} 493}
494 494
495static void inic_dev_config(struct ata_port *ap, struct ata_device *dev) 495static void inic_dev_config(struct ata_device *dev)
496{ 496{
497 /* inic can only handle upto LBA28 max sectors */ 497 /* inic can only handle upto LBA28 max sectors */
498 if (dev->max_sectors > ATA_MAX_SECTORS) 498 if (dev->max_sectors > ATA_MAX_SECTORS)
diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index 917b7ea4ef7c..170d36e6260f 100644
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -114,7 +114,7 @@ static int sil_init_one (struct pci_dev *pdev, const struct pci_device_id *ent);
114#ifdef CONFIG_PM 114#ifdef CONFIG_PM
115static int sil_pci_device_resume(struct pci_dev *pdev); 115static int sil_pci_device_resume(struct pci_dev *pdev);
116#endif 116#endif
117static void sil_dev_config(struct ata_port *ap, struct ata_device *dev); 117static void sil_dev_config(struct ata_device *dev);
118static u32 sil_scr_read (struct ata_port *ap, unsigned int sc_reg); 118static u32 sil_scr_read (struct ata_port *ap, unsigned int sc_reg);
119static void sil_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val); 119static void sil_scr_write (struct ata_port *ap, unsigned int sc_reg, u32 val);
120static void sil_post_set_mode (struct ata_port *ap); 120static void sil_post_set_mode (struct ata_port *ap);
@@ -521,7 +521,6 @@ static void sil_thaw(struct ata_port *ap)
521 521
522/** 522/**
523 * sil_dev_config - Apply device/host-specific errata fixups 523 * sil_dev_config - Apply device/host-specific errata fixups
524 * @ap: Port containing device to be examined
525 * @dev: Device to be examined 524 * @dev: Device to be examined
526 * 525 *
527 * After the IDENTIFY [PACKET] DEVICE step is complete, and a 526 * After the IDENTIFY [PACKET] DEVICE step is complete, and a
@@ -548,8 +547,9 @@ static void sil_thaw(struct ata_port *ap)
548 * appreciated. 547 * appreciated.
549 * - But then again UDMA5 is hardly anything to complain about 548 * - But then again UDMA5 is hardly anything to complain about
550 */ 549 */
551static void sil_dev_config(struct ata_port *ap, struct ata_device *dev) 550static void sil_dev_config(struct ata_device *dev)
552{ 551{
552 struct ata_port *ap = dev->ap;
553 int print_info = ap->eh_context.i.flags & ATA_EHI_PRINTINFO; 553 int print_info = ap->eh_context.i.flags & ATA_EHI_PRINTINFO;
554 unsigned int n, quirks = 0; 554 unsigned int n, quirks = 0;
555 unsigned char model_num[ATA_ID_PROD_LEN + 1]; 555 unsigned char model_num[ATA_ID_PROD_LEN + 1];
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index 5614df8c1ce2..6698c746e624 100644
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -323,7 +323,7 @@ struct sil24_port_priv {
323 struct ata_taskfile tf; /* Cached taskfile registers */ 323 struct ata_taskfile tf; /* Cached taskfile registers */
324}; 324};
325 325
326static void sil24_dev_config(struct ata_port *ap, struct ata_device *dev); 326static void sil24_dev_config(struct ata_device *dev);
327static u8 sil24_check_status(struct ata_port *ap); 327static u8 sil24_check_status(struct ata_port *ap);
328static u32 sil24_scr_read(struct ata_port *ap, unsigned sc_reg); 328static u32 sil24_scr_read(struct ata_port *ap, unsigned sc_reg);
329static void sil24_scr_write(struct ata_port *ap, unsigned sc_reg, u32 val); 329static void sil24_scr_write(struct ata_port *ap, unsigned sc_reg, u32 val);
@@ -462,9 +462,9 @@ static int sil24_tag(int tag)
462 return tag; 462 return tag;
463} 463}
464 464
465static void sil24_dev_config(struct ata_port *ap, struct ata_device *dev) 465static void sil24_dev_config(struct ata_device *dev)
466{ 466{
467 void __iomem *port = ap->ioaddr.cmd_addr; 467 void __iomem *port = dev->ap->ioaddr.cmd_addr;
468 468
469 if (dev->cdb_len == 16) 469 if (dev->cdb_len == 16)
470 writel(PORT_CS_CDB16, port + PORT_CTRL_STAT); 470 writel(PORT_CS_CDB16, port + PORT_CTRL_STAT);
diff --git a/include/linux/libata.h b/include/linux/libata.h
index a41749820964..84787cad860d 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -597,7 +597,7 @@ struct ata_port {
597struct ata_port_operations { 597struct ata_port_operations {
598 void (*port_disable) (struct ata_port *); 598 void (*port_disable) (struct ata_port *);
599 599
600 void (*dev_config) (struct ata_port *, struct ata_device *); 600 void (*dev_config) (struct ata_device *);
601 601
602 void (*set_piomode) (struct ata_port *, struct ata_device *); 602 void (*set_piomode) (struct ata_port *, struct ata_device *);
603 void (*set_dmamode) (struct ata_port *, struct ata_device *); 603 void (*set_dmamode) (struct ata_port *, struct ata_device *);