ata: Logging message cleanups
Subsystems (2)
cover ata: Logging message cleanups
Neaten the code and shrink the text used about 5% or so for an x86 defconfig.
Joe Perches (4):
ata: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
ata: Convert ata_<foo>_printk(KERN_<LEVEL> to ata_<foo>_<level>(
ata: Add and use ata_print_version_once
ata: sata_via: Use dev_dbg
drivers/ata/acard-ahci.c | 27 ++-- drivers/ata/ahci.c | 53 +++--- drivers/ata/ata_generic.c | 5 +- drivers/ata/ata_piix.c | 44 +++--- drivers/ata/libahci.c | 95 +++++------ drivers/ata/libata-acpi.c | 66 +++---- drivers/ata/libata-core.c | 400 +++++++++++++++++++++++------------------ drivers/ata/libata-eh.c | 143 +++++++-------- drivers/ata/libata-pmp.c | 123 ++++++------- drivers/ata/libata-scsi.c | 22 +-- drivers/ata/libata-sff.c | 52 +++--- drivers/ata/pata_ali.c | 8 +- drivers/ata/pata_amd.c | 8 +- drivers/ata/pata_artop.c | 5 +- drivers/ata/pata_atp867x.c | 13 +- drivers/ata/pata_bf54x.c | 4 +- drivers/ata/pata_cs5520.c | 3 +- drivers/ata/pata_efar.c | 5 +- drivers/ata/pata_hpt3x3.c | 4 +- drivers/ata/pata_icside.c | 4 +- drivers/ata/pata_it8213.c | 5 +- drivers/ata/pata_it821x.c | 14 +- drivers/ata/pata_ixp4xx_cf.c | 4 +- drivers/ata/pata_legacy.c | 2 +- drivers/ata/pata_macio.c | 10 +- drivers/ata/pata_mpiix.c | 4 +- drivers/ata/pata_netcell.c | 5 +- drivers/ata/pata_ns87410.c | 2 +- drivers/ata/pata_ns87415.c | 5 +- drivers/ata/pata_octeon_cf.c | 8 +- drivers/ata/pata_oldpiix.c | 5 +- drivers/ata/pata_opti.c | 4 +- drivers/ata/pata_optidma.c | 4 +- drivers/ata/pata_pcmcia.c | 5 +- drivers/ata/pata_pdc2027x.c | 6 +- drivers/ata/pata_platform.c | 2 +- drivers/ata/pata_radisys.c | 5 +- drivers/ata/pata_rdc.c | 5 +- drivers/ata/pata_rz1000.c | 4 +- drivers/ata/pata_samsung_cf.c | 2 +- drivers/ata/pata_scc.c | 8 +- drivers/ata/pata_sch.c | 5 +- drivers/ata/pata_sil680.c | 4 +- drivers/ata/pata_sis.c | 5 +- drivers/ata/pata_sl82c105.c | 6 +- drivers/ata/pata_triflex.c | 4 +- drivers/ata/pata_via.c | 8 +- drivers/ata/pdc_adma.c | 10 +- drivers/ata/sata_fsl.c | 43 ++--- drivers/ata/sata_inic162x.c | 31 ++-- drivers/ata/sata_mv.c | 94 +++++------ drivers/ata/sata_nv.c | 79 ++++----- drivers/ata/sata_promise.c | 6 +- drivers/ata/sata_qstor.c | 13 +- drivers/ata/sata_sil.c | 21 +-- drivers/ata/sata_sil24.c | 43 ++--- drivers/ata/sata_sis.c | 26 ++-- drivers/ata/sata_svw.c | 4 +- drivers/ata/sata_sx4.c | 4 +- drivers/ata/sata_uli.c | 4 +- drivers/ata/sata_via.c | 42 ++--- drivers/ata/sata_vsc.c | 9 +- include/linux/libata.h | 68 ++++++-- 63 files changed, 821 insertions(+), 901 deletions(-)
Signature · 1 line
1.7.4.2.g597a6.dirty
PATCH 1/4 ata: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
Saves a bit of text as the call takes fewer args.
Coalesce a few formats.
Convert a few bare printks to pr_cont.
$ size drivers/ata/built-in.o* text data bss dec hex filename 558429 73893 117864 750186 b726a drivers/ata/built-in.o.allyesconfig.new 559574 73893 117888 751355 b76fb drivers/ata/built-in.o.allyesconfig.old 149567 14689 4220 168476 2921c drivers/ata/built-in.o.defconfig.new 149851 14689 4220 168760 29338 drivers/ata/built-in.o.defconfig.old
Signed-off-by Joe Perches <[email protected]>
--- drivers/ata/acard-ahci.c | 23 ++++++-------- drivers/ata/ahci.c | 44 ++++++++++++------------- drivers/ata/ata_piix.c | 39 ++++++++++++----------- drivers/ata/libahci.c | 71 +++++++++++++++++------------------------ drivers/ata/libata-core.c | 13 +++---- drivers/ata/libata-sff.c | 20 +++++------- drivers/ata/pata_amd.c | 2 +- drivers/ata/pata_atp867x.c | 11 +++--- drivers/ata/pata_cs5520.c | 3 +- drivers/ata/pata_ixp4xx_cf.c | 2 +- drivers/ata/pata_macio.c | 5 ++- drivers/ata/pata_ns87410.c | 2 +- drivers/ata/pata_pdc2027x.c | 2 +- drivers/ata/pata_sl82c105.c | 6 ++- drivers/ata/pdc_adma.c | 6 +-- drivers/ata/sata_fsl.c | 14 +++----- drivers/ata/sata_inic162x.c | 12 ++----- drivers/ata/sata_mv.c | 49 +++++++++++++---------------- drivers/ata/sata_nv.c | 6 ++-- drivers/ata/sata_promise.c | 2 +- drivers/ata/sata_qstor.c | 9 ++--- drivers/ata/sata_sil.c | 9 ++--- drivers/ata/sata_sil24.c | 22 ++++++------- drivers/ata/sata_sis.c | 24 ++++++-------- drivers/ata/sata_uli.c | 2 +- drivers/ata/sata_via.c | 16 +++++----- drivers/ata/sata_vsc.c | 5 +-- 27 files changed, 189 insertions(+), 230 deletions(-)
drivers/ata/acard-ahci.c +10 -13
@@ -135,8 +135,8 @@ static int acard_ahci_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesgif (mesg.event &PM_EVENT_SUSPEND && hpriv->flags &AHCI_HFLAG_NO_SUSPEND ) { -dev_printk (KERN_ERR , &pdev->dev, -"BIOS update required for suspend/resume\n" ); +dev_err (&pdev->dev, +"BIOS update required for suspend/resume\n" );return -EIO ; }
@@ -187,7 +187,7 @@ static int acard_ahci_configure_dma_masks(struct pci_dev *pdev, int using_dac)if (rc) { rc =pci_set_consistent_dma_mask (pdev,DMA_BIT_MASK (32 ));if (rc) { -dev_printk (KERN_ERR , &pdev->dev, +dev_err (&pdev->dev,"64-bit DMA enable failed\n" );return rc; }
@@ -195,14 +195,13 @@ static int acard_ahci_configure_dma_masks(struct pci_dev *pdev, int using_dac) }else { rc =pci_set_dma_mask (pdev,DMA_BIT_MASK (32 ));if (rc) { -dev_printk (KERN_ERR , &pdev->dev, -"32-bit DMA enable failed\n" ); +dev_err (&pdev->dev,"32-bit DMA enable failed\n" );return rc; } rc =pci_set_consistent_dma_mask (pdev,DMA_BIT_MASK (32 ));if (rc) { -dev_printk (KERN_ERR , &pdev->dev, -"32-bit consistent DMA enable failed\n" ); +dev_err (&pdev->dev, +"32-bit consistent DMA enable failed\n" );return rc; } }
@@ -343,14 +342,12 @@ static int acard_ahci_port_start(struct ata_port *ap)if (cmd &PORT_CMD_FBSCP ) pp->fbs_supported = true;else if (hpriv->flags &AHCI_HFLAG_YES_FBS ) { -dev_printk (KERN_INFO , dev, -"port %d can do FBS, forcing FBSCP\n" , - ap->port_no); +dev_info (dev,"port %d can do FBS, forcing FBSCP\n" , + ap->port_no); pp->fbs_supported = true; }else -dev_printk (KERN_WARNING , dev, -"port %d is not capable of FBS\n" , - ap->port_no); +dev_warn (dev,"port %d is not capable of FBS\n" , + ap->port_no); }if (pp->fbs_supported) {
drivers/ata/ahci.c +21 -23
106 lines not on this page · raw message
drivers/ata/ata_piix.c +20 -19
@@ -1217,8 +1217,9 @@ static int piix_pci_device_resume(struct pci_dev *pdev)*/ rc =pci_reenable_device (pdev);if (rc) -dev_printk (KERN_ERR , &pdev->dev,"failed to enable " -"device after resume (%d)\n" , rc); +dev_err (&pdev->dev, +"failed to enable device after resume (%d)\n" , + rc); }else rc =ata_pci_device_do_resume (pdev);
@@ -1295,9 +1296,11 @@ static int __devinit piix_check_450nx_errata(struct pci_dev *ata_dev) no_piix_dma =2 ; }if (no_piix_dma) -dev_printk (KERN_WARNING , &ata_dev->dev,"450NX errata present, disabling IDE DMA.\n" ); -if (no_piix_dma ==2 ) -dev_printk (KERN_WARNING , &ata_dev->dev,"A BIOS update may resolve this.\n" ); +dev_warn (&ata_dev->dev, +"450NX errata present, disabling IDE DMA%s\n" , + no_piix_dma ==2 ?" - a BIOS update may resolve this" + :"" ); +return no_piix_dma; }
@@ -1330,37 +1333,36 @@ static const int *__devinit piix_init_sata_map(struct pci_dev *pdev, map = map_db->map[map_value & map_db->mask]; -dev_printk (KERN_INFO , &pdev->dev,"MAP [" ); +dev_info (&pdev->dev,"MAP [" );for (i =0 ; i <4 ; i++) {switch (map[i]) {case RV : invalid_map =1 ; -printk (" XX" ); +pr_cont (" XX" );break ;case NA : -printk (" --" ); +pr_cont (" --" );break ;case IDE :WARN_ON ((i &1 ) || map[i +1 ] !=IDE ); pinfo[i /2 ] = piix_port_info[ich_pata_100]; i++; -printk (" IDE IDE" ); +pr_cont (" IDE IDE" );break ;default : -printk (" P%d" , map[i]); +pr_cont (" P%d" , map[i]);if (i &1 ) pinfo[i /2 ].flags |=ATA_FLAG_SLAVE_POSS ;break ; } } -printk (" ]\n" ); +pr_cont (" ]\n" );if (invalid_map) -dev_printk (KERN_ERR , &pdev->dev, -"invalid MAP value %u\n" , map_value); +dev_err (&pdev->dev,"invalid MAP value %u\n" , map_value);return map; }
@@ -1390,8 +1392,8 @@ static bool piix_no_sidpr(struct ata_host *host)if (pdev->vendor ==PCI_VENDOR_ID_INTEL && pdev->device ==0x2920 && pdev->subsystem_vendor ==PCI_VENDOR_ID_SAMSUNG && pdev->subsystem_device ==0xb049 ) { -dev_printk (KERN_WARNING , host->dev, -"Samsung DB-P70 detected, disabling SIDPR\n" ); +dev_warn (host->dev, +"Samsung DB-P70 detected, disabling SIDPR\n" );return true; }
@@ -1443,8 +1445,8 @@ static int __devinit piix_init_sidpr(struct ata_host *host)piix_sidpr_scr_read (link0,SCR_CONTROL , &scontrol);if ((scontrol &0xf00 ) !=0x300 ) { -dev_printk (KERN_INFO , host->dev,"SCR access via " -"SIDPR is available but doesn't work\n" ); +dev_info (host->dev, +"SCR access via SIDPR is available but doesn't work\n" );return 0 ; } }
@@ -1493,8 +1495,7 @@ static void piix_iocfg_bit18_quirk(struct ata_host *host)* affected systems. */ if (hpriv->saved_iocfg & (1 <<18 )) { -dev_printk (KERN_INFO , &pdev->dev, -"applying IOCFG bit18 quirk\n" ); +dev_info (&pdev->dev,"applying IOCFG bit18 quirk\n" );pci_write_config_dword (pdev,PIIX_IOCFG , hpriv->saved_iocfg & ~(1 <<18 )); }
drivers/ata/libahci.c +30 -41
165 lines not on this page · raw message
drivers/ata/libata-core.c +6 -7
@@ -5840,9 +5840,9 @@ int ata_host_start(struct ata_host *host) rc = ap->ops->port_start (ap);if (rc) {if (rc != -ENODEV ) -dev_printk (KERN_ERR , host->dev, -"failed to start port %d " -"(errno=%d)\n" , i, rc); +dev_err (host->dev, +"failed to start port %d (errno=%d)\n" , + i, rc); goto err_out; } }
@@ -5964,8 +5964,7 @@ int ata_host_register(struct ata_host *host, struct scsi_host_template *sht)/* host must have been started */ if (!(host->flags &ATA_HOST_STARTED )) { -dev_printk (KERN_ERR , host->dev, -"BUG: trying to register unstarted host\n" ); +dev_err (host->dev,"BUG: trying to register unstarted host\n" );WARN_ON (1 );return -EINVAL ; }
@@ -6235,8 +6234,8 @@ int ata_pci_device_do_resume(struct pci_dev *pdev) rc =pcim_enable_device (pdev);if (rc) { -dev_printk (KERN_ERR , &pdev->dev, -"failed to enable device after resume (%d)\n" , rc); +dev_err (&pdev->dev, +"failed to enable device after resume (%d)\n" , rc);return rc; }
drivers/ata/libata-sff.c +8 -12
@@ -2316,9 +2316,9 @@ int ata_pci_sff_init_host(struct ata_host *host) rc =pcim_iomap_regions (pdev,0x3 << base,dev_driver_string (gdev));if (rc) { -dev_printk (KERN_WARNING , gdev, -"failed to request/iomap BARs for port %d " -"(errno=%d)\n" , i, rc); +dev_warn (gdev, +"failed to request/iomap BARs for port %d (errno=%d)\n" , + i, rc);if (rc == -EBUSY )pcim_pin_device (pdev); ap->ops = &ata_dummy_port_ops;
@@ -2340,7 +2340,7 @@ int ata_pci_sff_init_host(struct ata_host *host) }if (!mask) { -dev_printk (KERN_ERR , gdev,"no available native port\n" ); +dev_err (gdev,"no available native port\n" );return -ENODEV ; }
@@ -2375,8 +2375,7 @@ int ata_pci_sff_prepare_host(struct pci_dev *pdev, host =ata_host_alloc_pinfo (&pdev->dev, ppi,2 );if (!host) { -dev_printk (KERN_ERR , &pdev->dev, -"failed to allocate ATA host\n" ); +dev_err (&pdev->dev,"failed to allocate ATA host\n" ); rc = -ENOMEM ; goto err_out; }
@@ -2537,8 +2536,7 @@ int ata_pci_sff_init_one(struct pci_dev *pdev, pi =ata_sff_find_valid_pi (ppi);if (!pi) { -dev_printk (KERN_ERR , &pdev->dev, -"no valid port_info specified\n" ); +dev_err (&pdev->dev,"no valid port_info specified\n" );return -EINVAL ; }
@@ -3159,8 +3157,7 @@ static void ata_bmdma_nodma(struct ata_host *host, const char *reason) {int i; -dev_printk (KERN_ERR , host->dev,"BMDMA: %s, falling back to PIO\n" , - reason); +dev_err (host->dev,"BMDMA: %s, falling back to PIO\n" , reason);for (i =0 ; i <2 ; i++) { host->ports[i]->mwdma_mask =0 ;
@@ -3292,8 +3289,7 @@ int ata_pci_bmdma_init_one(struct pci_dev *pdev, pi =ata_sff_find_valid_pi (ppi);if (!pi) { -dev_printk (KERN_ERR , &pdev->dev, -"no valid port_info specified\n" ); +dev_err (&pdev->dev,"no valid port_info specified\n" );return -EINVAL ; }
drivers/ata/pata_amd.c +1 -1
@@ -60,7 +60,7 @@ static void timing_setup(struct ata_port *ap, struct ata_device *adev, int offseUT =T /2 ;if (ata_timing_compute (adev, speed, &at,T ,UT ) <0 ) { -dev_printk (KERN_ERR , &pdev->dev,"unknown mode %d.\n" , speed); +dev_err (&pdev->dev,"unknown mode %d\n" , speed);return ; }
drivers/ata/pata_atp867x.c +5 -6
@@ -470,7 +470,7 @@ static int atp867x_ata_pci_sff_init_host(struct ata_host *host) }if (!mask) { -dev_printk (KERN_ERR , gdev,"no available native port\n" ); +dev_err (gdev,"no available native port\n" );return -ENODEV ; }
@@ -500,7 +500,7 @@ static int atp867x_init_one(struct pci_dev *pdev,int rc;if (!printed_version++) -dev_printk (KERN_INFO , &pdev->dev,"version " DRV_VERSION "\n" ); +dev_info (&pdev->dev,"version " DRV_VERSION "\n" ); rc =pcim_enable_device (pdev);if (rc)
@@ -511,15 +511,14 @@ static int atp867x_init_one(struct pci_dev *pdev, host =ata_host_alloc_pinfo (&pdev->dev, ppi,ATP867X_NUM_PORTS );if (!host) { -dev_printk (KERN_ERR , &pdev->dev, -"failed to allocate ATA host\n" ); +dev_err (&pdev->dev,"failed to allocate ATA host\n" ); rc = -ENOMEM ; goto err_out; } rc =atp867x_ata_pci_sff_init_host (host);if (rc) { -dev_printk (KERN_ERR , &pdev->dev,"failed to init host\n" ); +dev_err (&pdev->dev,"failed to init host\n" ); goto err_out; }
@@ -528,7 +527,7 @@ static int atp867x_init_one(struct pci_dev *pdev, rc =ata_host_activate (host, pdev->irq, ata_bmdma_interrupt,IRQF_SHARED , &atp867x_sht);if (rc) -dev_printk (KERN_ERR , &pdev->dev,"failed to activate host\n" ); +dev_err (&pdev->dev,"failed to activate host\n" ); err_out:return rc;
drivers/ata/pata_cs5520.c +1 -2
@@ -149,8 +149,7 @@ static int __devinit cs5520_init_one(struct pci_dev *pdev, const struct pci_devi ppi[1 ] = πif ((pcicfg &0x40 ) ==0 ) { -dev_printk (KERN_WARNING , &pdev->dev, -"DMA mode disabled. Enabling.\n" ); +dev_warn (&pdev->dev,"DMA mode disabled. Enabling.\n" );pci_write_config_byte (pdev,0x60 , pcicfg |0x40 ); }
drivers/ata/pata_ixp4xx_cf.c +1 -1
@@ -181,7 +181,7 @@ static __devinit int ixp4xx_pata_probe(struct platform_device *pdev)ixp4xx_setup_port (ap, data, cs0->start, cs1->start); -dev_printk (KERN_INFO , &pdev->dev,"version " DRV_VERSION "\n" ); +dev_info (&pdev->dev,"version " DRV_VERSION "\n" );/* activate host */ return ata_host_activate (host, irq, ata_sff_interrupt,0 , &ixp4xx_sht);
drivers/ata/pata_macio.c +3 -2
@@ -772,8 +772,9 @@ static void pata_macio_reset_hw(struct pata_macio_priv *priv, int resume)pci_restore_state (priv->pdev); rc =pcim_enable_device (priv->pdev);if (rc) -dev_printk (KERN_ERR , &priv->pdev->dev, -"Failed to enable device after resume (%d)\n" , rc); +dev_err (&priv->pdev->dev, +"Failed to enable device after resume (%d)\n" , + rc);else pci_set_master (priv->pdev); }
drivers/ata/pata_ns87410.c +1 -1
@@ -86,7 +86,7 @@ static void ns87410_set_piomode(struct ata_port *ap, struct ata_device *adev) idefr &= ~0x04 ;if (ata_timing_compute (adev, adev->pio_mode, &at,30303 ,1 ) <0 ) { -dev_printk (KERN_ERR , &pdev->dev,"unknown mode %d.\n" , adev->pio_mode); +dev_err (&pdev->dev,"unknown mode %d\n" , adev->pio_mode);return ; }
drivers/ata/pata_pdc2027x.c +1 -1
@@ -655,7 +655,7 @@ static int pdc_hardware_init(struct ata_host *host, unsigned int board_idx)*/ pll_clock =pdc_detect_pll_input_clock (host); -dev_printk (KERN_INFO , host->dev,"PLL input clock %ld kHz\n" , pll_clock/1000 ); +dev_info (host->dev,"PLL input clock %ld kHz\n" , pll_clock/1000 );/* Adjust PLL control register */ pdc_adjust_pll (host, pll_clock, board_idx);
drivers/ata/pata_sl82c105.c +4 -2
@@ -317,9 +317,11 @@ static int sl82c105_init_one(struct pci_dev *dev, const struct pci_device_id *id rev =sl82c105_bridge_revision (dev);if (rev ==-1 ) -dev_printk (KERN_WARNING , &dev->dev,"pata_sl82c105: Unable to find bridge, disabling DMA.\n" ); +dev_warn (&dev->dev, +"pata_sl82c105: Unable to find bridge, disabling DMA\n" );else if (rev <=5 ) -dev_printk (KERN_WARNING , &dev->dev,"pata_sl82c105: Early bridge revision, no DMA available.\n" ); +dev_warn (&dev->dev, +"pata_sl82c105: Early bridge revision, no DMA available\n" );else ppi[0 ] = &info_dma;
drivers/ata/pdc_adma.c +2 -4
@@ -596,14 +596,12 @@ static int adma_set_dma_masks(struct pci_dev *pdev, void __iomem *mmio_base) rc =pci_set_dma_mask (pdev,DMA_BIT_MASK (32 ));if (rc) { -dev_printk (KERN_ERR , &pdev->dev, -"32-bit DMA enable failed\n" ); +dev_err (&pdev->dev,"32-bit DMA enable failed\n" );return rc; } rc =pci_set_consistent_dma_mask (pdev,DMA_BIT_MASK (32 ));if (rc) { -dev_printk (KERN_ERR , &pdev->dev, -"32-bit consistent DMA enable failed\n" ); +dev_err (&pdev->dev,"32-bit consistent DMA enable failed\n" );return rc; }return 0 ;
drivers/ata/sata_fsl.c +5 -9
@@ -661,8 +661,7 @@ static int sata_fsl_port_start(struct ata_port *ap)sata_fsl_scr_write (&ap->link,SCR_CONTROL , temp);sata_fsl_scr_read (&ap->link,SCR_CONTROL , &temp); -dev_printk (KERN_WARNING , dev,"scr_control, speed limited to %x\n" , - temp); +dev_warn (dev,"scr_control, speed limited to %x\n" , temp);#endif return 0 ;
@@ -1202,8 +1201,7 @@ static irqreturn_t sata_fsl_interrupt(int irq, void *dev_instance)if (ap) {sata_fsl_host_intr (ap); }else { -dev_printk (KERN_WARNING , host->dev, -"interrupt on disabled port 0\n" ); +dev_warn (host->dev,"interrupt on disabled port 0\n" ); }iowrite32 (interrupt_enables, hcr_base +HSTATUS );
@@ -1317,8 +1315,7 @@ static int sata_fsl_probe(struct platform_device *ofdev)struct ata_port_info pi = sata_fsl_port_info[0 ];const struct ata_port_info *ppi[] = { &pi,NULL }; -dev_printk (KERN_INFO , &ofdev->dev, -"Sata FSL Platform/CSB Driver init\n" ); +dev_info (&ofdev->dev,"Sata FSL Platform/CSB Driver init\n" ); hcr_base =of_iomap (ofdev->dev.of_node,0 );if (!hcr_base)
@@ -1347,7 +1344,7 @@ static int sata_fsl_probe(struct platform_device *ofdev) irq =irq_of_parse_and_map (ofdev->dev.of_node,0 );if (irq <0 ) { -dev_printk (KERN_ERR , &ofdev->dev,"invalid irq from platform\n" ); +dev_err (&ofdev->dev,"invalid irq from platform\n" ); goto error_exit_with_cleanup; } host_priv->irq = irq;
@@ -1422,8 +1419,7 @@ static int sata_fsl_resume(struct platform_device *op) ret =sata_fsl_init_controller (host);if (ret) { -dev_printk (KERN_ERR , &op->dev, -"Error initialize hardware\n" ); +dev_err (&op->dev,"Error initializing hardware\n" );return ret; }
drivers/ata/sata_inic162x.c +4 -8
@@ -847,15 +847,13 @@ static int inic_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)/* Set dma_mask. This devices doesn't support 64bit addressing. */ rc =pci_set_dma_mask (pdev,DMA_BIT_MASK (32 ));if (rc) { -dev_printk (KERN_ERR , &pdev->dev, -"32-bit DMA enable failed\n" ); +dev_err (&pdev->dev,"32-bit DMA enable failed\n" );return rc; } rc =pci_set_consistent_dma_mask (pdev,DMA_BIT_MASK (32 ));if (rc) { -dev_printk (KERN_ERR , &pdev->dev, -"32-bit consistent DMA enable failed\n" ); +dev_err (&pdev->dev,"32-bit consistent DMA enable failed\n" );return rc; }
@@ -866,15 +864,13 @@ static int inic_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)*/ rc =pci_set_dma_max_seg_size (pdev,65536 -512 );if (rc) { -dev_printk (KERN_ERR , &pdev->dev, -"failed to set the maximum segment size.\n" ); +dev_err (&pdev->dev,"failed to set the maximum segment size\n" );return rc; } rc =init_controller (hpriv->mmio_base, hpriv->cached_hctl);if (rc) { -dev_printk (KERN_ERR , &pdev->dev, -"failed to initialize controller\n" ); +dev_err (&pdev->dev,"failed to initialize controller\n" );return rc; }
drivers/ata/sata_mv.c +22 -27
125 lines not on this page · raw message
drivers/ata/sata_nv.c +3 -3
@@ -2382,10 +2382,10 @@ static int nv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)/* determine type and allocate host */ if (type ==CK804 && adma_enabled) { -dev_printk (KERN_NOTICE , &pdev->dev,"Using ADMA mode\n" ); +dev_notice (&pdev->dev,"Using ADMA mode\n" ); type =ADMA ; }else if (type == MCP5x && swncq_enabled) { -dev_printk (KERN_NOTICE , &pdev->dev,"Using SWNCQ mode\n" ); +dev_notice (&pdev->dev,"Using SWNCQ mode\n" ); type =SWNCQ ; }
@@ -2429,7 +2429,7 @@ static int nv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)nv_swncq_host_init (host);if (msi_enabled) { -dev_printk (KERN_NOTICE , &pdev->dev,"Using MSI\n" ); +dev_notice (&pdev->dev,"Using MSI\n" );pci_enable_msi (pdev); }
drivers/ata/sata_promise.c +1 -1
@@ -1217,7 +1217,7 @@ static int pdc_ata_init_one(struct pci_dev *pdev, host =ata_host_alloc_pinfo (&pdev->dev, ppi, n_ports);if (!host) { -dev_printk (KERN_ERR , &pdev->dev,"failed to allocate host\n" ); +dev_err (&pdev->dev,"failed to allocate host\n" );return -ENOMEM ; } host->iomap =pcim_iomap_table (pdev);
drivers/ata/sata_qstor.c +4 -5
@@ -563,21 +563,20 @@ static int qs_set_dma_masks(struct pci_dev *pdev, void __iomem *mmio_base)if (rc) { rc =pci_set_consistent_dma_mask (pdev,DMA_BIT_MASK (32 ));if (rc) { -dev_printk (KERN_ERR , &pdev->dev, -"64-bit DMA enable failed\n" ); +dev_err (&pdev->dev, +"64-bit DMA enable failed\n" );return rc; } } }else { rc =pci_set_dma_mask (pdev,DMA_BIT_MASK (32 ));if (rc) { -dev_printk (KERN_ERR , &pdev->dev, -"32-bit DMA enable failed\n" ); +dev_err (&pdev->dev,"32-bit DMA enable failed\n" );return rc; } rc =pci_set_consistent_dma_mask (pdev,DMA_BIT_MASK (32 ));if (rc) { -dev_printk (KERN_ERR , &pdev->dev, +dev_err (&pdev->dev,"32-bit consistent DMA enable failed\n" );return rc; }
drivers/ata/sata_sil.c +4 -5
@@ -676,8 +676,8 @@ static void sil_init_controller(struct ata_host *host)writew (cls <<8 | cls, mmio_base + sil_port[i].fifo_cfg); }else -dev_printk (KERN_WARNING , &pdev->dev, -"cache line size not set. Driver may not function\n" ); +dev_warn (&pdev->dev, +"cache line size not set. Driver may not function\n" );/* Apply R_ERR on DMA activate FIS errata workaround */ if (host->ports[0 ]->flags &SIL_FLAG_RERR_ON_DMA_ACT ) {
@@ -688,9 +688,8 @@ static void sil_init_controller(struct ata_host *host)if ((tmp &0x3 ) !=0x01 )continue ;if (!cnt) -dev_printk (KERN_INFO , &pdev->dev, -"Applying R_ERR on DMA activate " -"FIS errata fix\n" ); +dev_info (&pdev->dev, +"Applying R_ERR on DMA activate FIS errata fix\n" );writel (tmp & ~0x3 , mmio_base + sil_port[i].sfis_cfg); cnt++; }
drivers/ata/sata_sil24.c +10 -12
@@ -1256,8 +1256,8 @@ static void sil24_init_controller(struct ata_host *host)PORT_CS_PORT_RST , PORT_CS_PORT_RST, 10, 100);if (tmp &PORT_CS_PORT_RST ) -dev_printk (KERN_ERR , host->dev, -"failed to clear port RST\n" ); +dev_err (host->dev, +"failed to clear port RST\n" ); }/* configure port */
@@ -1302,9 +1302,8 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)if (pi.flags &SIL24_FLAG_PCIX_IRQ_WOC ) { tmp =readl (iomap[SIL24_HOST_BAR ] +HOST_CTRL );if (tmp & (HOST_CTRL_TRDY |HOST_CTRL_STOP |HOST_CTRL_DEVSEL )) -dev_printk (KERN_INFO , &pdev->dev, -"Applying completion IRQ loss on PCI-X " -"errata fix\n" ); +dev_info (&pdev->dev, +"Applying completion IRQ loss on PCI-X errata fix\n" );else pi.flags &= ~SIL24_FLAG_PCIX_IRQ_WOC ; }
@@ -1322,22 +1321,21 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)if (rc) { rc =pci_set_consistent_dma_mask (pdev,DMA_BIT_MASK (32 ));if (rc) { -dev_printk (KERN_ERR , &pdev->dev, -"64-bit DMA enable failed\n" ); +dev_err (&pdev->dev, +"64-bit DMA enable failed\n" );return rc; } } }else { rc =pci_set_dma_mask (pdev,DMA_BIT_MASK (32 ));if (rc) { -dev_printk (KERN_ERR , &pdev->dev, -"32-bit DMA enable failed\n" ); +dev_err (&pdev->dev,"32-bit DMA enable failed\n" );return rc; } rc =pci_set_consistent_dma_mask (pdev,DMA_BIT_MASK (32 ));if (rc) { -dev_printk (KERN_ERR , &pdev->dev, -"32-bit consistent DMA enable failed\n" ); +dev_err (&pdev->dev, +"32-bit consistent DMA enable failed\n" );return rc; } }
@@ -1350,7 +1348,7 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)sil24_init_controller (host);if (sata_sil24_msi && !pci_enable_msi (pdev)) { -dev_printk (KERN_INFO , &pdev->dev,"Using MSI\n" ); +dev_info (&pdev->dev,"Using MSI\n" );pci_intx (pdev,0 ); }
drivers/ata/sata_sis.c +11 -13
@@ -203,7 +203,7 @@ static int sis_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)int i, rc;if (!printed_version++) -dev_printk (KERN_INFO , &pdev->dev,"version " DRV_VERSION "\n" ); +dev_info (&pdev->dev,"version " DRV_VERSION "\n" ); rc =pcim_enable_device (pdev);if (rc)
@@ -241,12 +241,12 @@ static int sis_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)break ; }if ((pmr &SIS_PMR_COMBINED ) ==0 ) { -dev_printk (KERN_INFO , &pdev->dev, -"Detected SiS 180/181/964 chipset in SATA mode\n" ); +dev_info (&pdev->dev, +"Detected SiS 180/181/964 chipset in SATA mode\n" ); port2_start =64 ; }else { -dev_printk (KERN_INFO , &pdev->dev, -"Detected SiS 180/181 chipset in combined mode\n" ); +dev_info (&pdev->dev, +"Detected SiS 180/181 chipset in combined mode\n" ); port2_start =0 ; pi.flags |=ATA_FLAG_SLAVE_POSS ; }
@@ -256,24 +256,22 @@ static int sis_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)case 0x0183 :pci_read_config_dword (pdev,0x6C , &val);if (val & (1L <<31 )) { -dev_printk (KERN_INFO , &pdev->dev, -"Detected SiS 182/965 chipset\n" ); +dev_info (&pdev->dev,"Detected SiS 182/965 chipset\n" ); pi.flags |=ATA_FLAG_SLAVE_POSS ; }else { -dev_printk (KERN_INFO , &pdev->dev, -"Detected SiS 182/965L chipset\n" ); +dev_info (&pdev->dev,"Detected SiS 182/965L chipset\n" ); }break ;case 0x1182 : -dev_printk (KERN_INFO , &pdev->dev, -"Detected SiS 1182/966/680 SATA controller\n" ); +dev_info (&pdev->dev, +"Detected SiS 1182/966/680 SATA controller\n" ); pi.flags |=ATA_FLAG_SLAVE_POSS ;break ;case 0x1183 : -dev_printk (KERN_INFO , &pdev->dev, -"Detected SiS 1183/966/966L/968/680 controller in PATA mode\n" ); +dev_info (&pdev->dev, +"Detected SiS 1183/966/966L/968/680 controller in PATA mode\n" ); ppi[0 ] = &sis_info133_for_sata; ppi[1 ] = &sis_info133_for_sata;break ;
drivers/ata/sata_uli.c +1 -1
@@ -155,7 +155,7 @@ static int uli_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)int n_ports, rc;if (!printed_version++) -dev_printk (KERN_INFO , &pdev->dev,"version " DRV_VERSION "\n" ); +dev_info (&pdev->dev,"version " DRV_VERSION "\n" ); rc =pcim_enable_device (pdev);if (rc)
drivers/ata/sata_via.c +8 -8
@@ -469,7 +469,7 @@ static int vt6420_prepare_host(struct pci_dev *pdev, struct ata_host **r_host) rc =pcim_iomap_regions (pdev,1 <<5 ,DRV_NAME );if (rc) { -dev_printk (KERN_ERR , &pdev->dev,"failed to iomap PCI BAR 5\n" ); +dev_err (&pdev->dev,"failed to iomap PCI BAR 5\n" );return rc; }
@@ -488,14 +488,14 @@ static int vt6421_prepare_host(struct pci_dev *pdev, struct ata_host **r_host) *r_host = host =ata_host_alloc_pinfo (&pdev->dev, ppi,ARRAY_SIZE (ppi));if (!host) { -dev_printk (KERN_ERR , &pdev->dev,"failed to allocate host\n" ); +dev_err (&pdev->dev,"failed to allocate host\n" );return -ENOMEM ; } rc =pcim_iomap_regions (pdev,0x3f ,DRV_NAME );if (rc) { -dev_printk (KERN_ERR , &pdev->dev,"failed to request/iomap " -"PCI BARs (errno=%d)\n" , rc); +dev_err (&pdev->dev,"failed to request/iomap PCI BARs (errno=%d)\n" , + rc);return rc; } host->iomap =pcim_iomap_table (pdev);
@@ -526,7 +526,7 @@ static int vt8251_prepare_host(struct pci_dev *pdev, struct ata_host **r_host) rc =pcim_iomap_regions (pdev,1 <<5 ,DRV_NAME );if (rc) { -dev_printk (KERN_ERR , &pdev->dev,"failed to iomap PCI BAR 5\n" ); +dev_err (&pdev->dev,"failed to iomap PCI BAR 5\n" );return rc; }
@@ -542,8 +542,8 @@ static void svia_configure(struct pci_dev *pdev, int board_id)u8 tmp8;pci_read_config_byte (pdev,PCI_INTERRUPT_LINE , &tmp8); -dev_printk (KERN_INFO , &pdev->dev,"routed to hard irq line %d\n" , - (int ) (tmp8 &0xf0 ) ==0xf0 ?0 : tmp8 &0x0f ); +dev_info (&pdev->dev,"routed to hard irq line %d\n" , + (int ) (tmp8 &0xf0 ) ==0xf0 ?0 : tmp8 &0x0f );/* make sure SATA channels are enabled */ pci_read_config_byte (pdev,SATA_CHAN_ENAB , &tmp8);
@@ -628,7 +628,7 @@ static int svia_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)for (i =0 ; i <ARRAY_SIZE (svia_bar_sizes); i++)if ((pci_resource_start (pdev, i) ==0 ) || (pci_resource_len (pdev, i) < bar_sizes[i])) { - dev_printk(KERN_ERR, &pdev->dev, + dev_err(&pdev->dev, "invalid PCI BAR %u (sz 0x%llx, val 0x%llx)\n", i, (unsigned long long)pci_resource_start(pdev, i),
drivers/ata/sata_vsc.c +2 -3
@@ -273,9 +273,8 @@ static irqreturn_t vsc_sata_interrupt(int irq, void *dev_instance)if (unlikely (status ==0xffffffff || status ==0 )) {if (status) -dev_printk (KERN_ERR , host->dev, -": IRQ status == 0xffffffff, " -"PCI fault or device removal?\n" ); +dev_err (host->dev, +": IRQ status == 0xffffffff, PCI fault or device removal?\n" ); goto out; }
Signature · 1 line
1.7.4.2.g597a6.dirty
PATCH 2/4 ata: Convert ata_<foo>_printk(KERN_<LEVEL> to ata_<foo>_<level>(
In reply to Joe PerchesSaves text by removing nearly duplicated text format strings by creating ata_<foo>_printk functions and printf extension %pV.
ata defconfig size shrinks ~5% (~8KB), allyesconfig ~2.5% (~13KB)
Format string duplication comes from:
#define ata_link_printk(link, lv, fmt, args...) do { \
if (sata_pmp_attached((link)->ap) || (link)->ap->slave_link) \
printk("%sata%u.%02u: "fmt, lv, (link)->ap->print_id, \
(link)->pmp , ##args); \
else \
printk("%sata%u: "fmt, lv, (link)->ap->print_id , ##args); \
} while(0)Coalesce long formats.
$ size drivers/ata/built-in.* text data bss dec hex filename 544969 73893 116584 735446 b38d6 drivers/ata/built-in.allyesconfig.ata.o 558429 73893 117864 750186 b726a drivers/ata/built-in.allyesconfig.dev_level.o 141328 14689 4220 160237 271ed drivers/ata/built-in.defconfig.ata.o 149567 14689 4220 168476 2921c drivers/ata/built-in.defconfig.dev_level.o
Signed-off-by Joe Perches <[email protected]>
--- drivers/ata/ahci.c | 5 +- drivers/ata/ata_generic.c | 5 +- drivers/ata/libahci.c | 24 ++-- drivers/ata/libata-acpi.c | 66 +++---- drivers/ata/libata-core.c | 381 +++++++++++++++++++++++------------------ drivers/ata/libata-eh.c | 143 ++++++++-------- drivers/ata/libata-pmp.c | 123 +++++++------- drivers/ata/libata-scsi.c | 22 +-- drivers/ata/libata-sff.c | 32 ++-- drivers/ata/pata_ali.c | 8 +- drivers/ata/pata_amd.c | 2 +- drivers/ata/pata_bf54x.c | 4 +- drivers/ata/pata_icside.c | 4 +- drivers/ata/pata_it821x.c | 14 +- drivers/ata/pata_ixp4xx_cf.c | 2 +- drivers/ata/pata_legacy.c | 2 +- drivers/ata/pata_macio.c | 5 +- drivers/ata/pata_octeon_cf.c | 2 +- drivers/ata/pata_pcmcia.c | 5 +- drivers/ata/pata_platform.c | 2 +- drivers/ata/pata_rz1000.c | 2 +- drivers/ata/pata_samsung_cf.c | 2 +- drivers/ata/pata_scc.c | 3 +- drivers/ata/pata_via.c | 4 +- drivers/ata/sata_fsl.c | 29 ++-- drivers/ata/sata_inic162x.c | 15 +- drivers/ata/sata_mv.c | 41 ++--- drivers/ata/sata_nv.c | 69 ++++---- drivers/ata/sata_sil.c | 8 +- drivers/ata/sata_sil24.c | 17 +- drivers/ata/sata_via.c | 6 +- include/linux/libata.h | 56 +++++-- 32 files changed, 568 insertions(+), 535 deletions(-)
drivers/ata/ahci.c +2 -3
@@ -534,9 +534,8 @@ static int ahci_sb600_softreset(struct ata_link *link, unsigned int *class,if (rc == -EIO ) { irq_sts =readl (port_mmio +PORT_IRQ_STAT );if (irq_sts &PORT_IRQ_BAD_PMP ) { -ata_link_printk (link,KERN_WARNING , -"applying SB600 PMP SRST workaround " -"and retrying\n" ); +ata_link_warn (link, +"applying SB600 PMP SRST workaround and retrying\n" ); rc =ahci_do_softreset (link, class,0 , deadline, ahci_check_ready); }
drivers/ata/ata_generic.c +2 -3
@@ -81,14 +81,13 @@ static int generic_set_mode(struct ata_link *link, struct ata_device **unused) xfer_mask |=ata_xfer_mode2mask (XFER_MW_DMA_0 ); } -ata_dev_printk (dev,KERN_INFO ,"configured for %s\n" , - name); +ata_dev_info (dev,"configured for %s\n" , name); dev->xfer_mode =ata_xfer_mask2mode (xfer_mask); dev->xfer_shift =ata_xfer_mode2shift (dev->xfer_mode); dev->flags &= ~ATA_DFLAG_PIO ; }else { -ata_dev_printk (dev,KERN_INFO ,"configured for PIO\n" ); +ata_dev_info (dev,"configured for PIO\n" ); dev->xfer_mode =XFER_PIO_0 ; dev->xfer_shift =ATA_SHIFT_PIO ; dev->flags |=ATA_DFLAG_PIO ;
drivers/ata/libahci.c +11 -13
@@ -282,10 +282,10 @@ static ssize_t ahci_read_em_buffer(struct device *dev,/* the count should not be larger than PAGE_SIZE */ if (count >PAGE_SIZE ) {if (printk_ratelimit ()) -ata_port_printk (ap,KERN_WARNING , -"EM read buffer size too large: " -"buffer size %u, page size %lu\n" , - hpriv->em_buf_sz,PAGE_SIZE ); +ata_port_warn (ap, +"EM read buffer size too large: " +"buffer size %u, page size %lu\n" , + hpriv->em_buf_sz,PAGE_SIZE ); count =PAGE_SIZE ; }
@@ -1102,8 +1102,8 @@ static void ahci_dev_config(struct ata_device *dev)if (hpriv->flags &AHCI_HFLAG_SECT255 ) { dev->max_sectors =255 ; -ata_dev_printk (dev,KERN_INFO , -"SB600 AHCI: limiting to 255 sectors per cmd\n" ); +ata_dev_info (dev, +"SB600 AHCI: limiting to 255 sectors per cmd\n" ); } }
@@ -1227,8 +1227,7 @@ int ahci_do_softreset(struct ata_link *link, unsigned int *class,/* prepare for SRST (AHCI-1.1 10.4.1) */ rc =ahci_kick_engine (ap);if (rc && rc != -EOPNOTSUPP ) -ata_link_printk (link,KERN_WARNING , -"failed to reset engine (errno=%d)\n" , rc); +ata_link_warn (link,"failed to reset engine (errno=%d)\n" , rc);ata_tf_init (link->device, &tf);
@@ -1261,8 +1260,7 @@ int ahci_do_softreset(struct ata_link *link, unsigned int *class,* be trusted. Treat device readiness timeout as link * offline. */ -ata_link_printk (link,KERN_INFO , -"device not ready, treating as offline\n" ); +ata_link_info (link,"device not ready, treating as offline\n" ); *class =ATA_DEV_NONE ; }else if (rc) {/* link occupied, -ENODEV too is an error */
@@ -1275,7 +1273,7 @@ int ahci_do_softreset(struct ata_link *link, unsigned int *class,return 0 ; fail: -ata_link_printk (link,KERN_ERR ,"softreset failed (%s)\n" , reason); +ata_link_err (link,"softreset failed (%s)\n" , reason);return rc; }
@@ -1931,7 +1929,7 @@ static int ahci_port_suspend(struct ata_port *ap, pm_message_t mesg)if (rc ==0 )ahci_power_down (ap);else { -ata_port_printk (ap,KERN_ERR ,"%s (%d)\n" , emsg, rc); +ata_port_err (ap,"%s (%d)\n" , emsg, rc);ahci_start_port (ap); }
@@ -2026,7 +2024,7 @@ static void ahci_port_stop(struct ata_port *ap)/* de-initialize port */ rc =ahci_deinit_port (ap, &emsg);if (rc) -ata_port_printk (ap,KERN_WARNING ,"%s (%d)\n" , emsg, rc); +ata_port_warn (ap,"%s (%d)\n" , emsg, rc); }void ahci_print_info (struct ata_host *host,const char *scc_s)
drivers/ata/libata-acpi.c +28 -38
146 lines not on this page · raw message
drivers/ata/libata-core.c +215 -166
759 lines not on this page · raw message
drivers/ata/libata-eh.c +68 -75
341 lines not on this page · raw message
drivers/ata/libata-pmp.c +59 -64
269 lines not on this page · raw message
drivers/ata/libata-scsi.c +9 -13
@@ -1108,8 +1108,7 @@ static int ata_scsi_dev_config(struct scsi_device *sdev,/* configure draining */ buf =kmalloc (ATAPI_MAX_DRAIN , q->bounce_gfp |GFP_KERNEL );if (!buf) { -ata_dev_printk (dev,KERN_ERR , -"drain buffer allocation failed\n" ); +ata_dev_err (dev,"drain buffer allocation failed\n" );return -ENOMEM ; }
@@ -1127,7 +1126,7 @@ static int ata_scsi_dev_config(struct scsi_device *sdev,* IDENTIFY_PACKET is executed as ATA_PROT_PIO. */ if (sdev->sector_size >PAGE_SIZE ) -ata_dev_printk (dev,KERN_WARNING , +ata_dev_warn (dev,"sector_size=%u > PAGE_SIZE, PIO may malfunction\n" , sdev->sector_size);
@@ -1783,8 +1782,7 @@ static int ata_scsi_translate(struct ata_device *dev, struct scsi_cmnd *cmd,if (cmd->sc_data_direction ==DMA_FROM_DEVICE || cmd->sc_data_direction ==DMA_TO_DEVICE ) {if (unlikely (scsi_bufflen (cmd) <1 )) { -ata_dev_printk (dev,KERN_WARNING , -"WARNING: zero len r/w req\n" ); +ata_dev_warn (dev,"WARNING: zero len r/w req\n" ); goto err_did; }
@@ -2968,9 +2966,8 @@ static unsigned int ata_scsi_pass_thru(struct ata_queued_cmd *qc)* with the cached multi_count of libata */ if (multi_count != dev->multi_count) -ata_dev_printk (dev,KERN_WARNING , -"invalid multi_count %u ignored\n" , - multi_count); +ata_dev_warn (dev,"invalid multi_count %u ignored\n" , + multi_count); }/*
@@ -3465,9 +3462,8 @@ void ata_scsi_scan_host(struct ata_port *ap, int sync) goto repeat; } -ata_port_printk (ap,KERN_ERR ,"WARNING: synchronous SCSI scan " -"failed without making any progress,\n" -" switching to async\n" ); +ata_port_err (ap, +"WARNING: synchronous SCSI scan failed without making any progress, switching to async\n" ); } queue_delayed_work(system_long_wq, &ap->hotplug_task,
@@ -3549,8 +3545,8 @@ static void ata_scsi_remove_dev(struct ata_device *dev)mutex_unlock (&ap->scsi_host->scan_mutex);if (sdev) { -ata_dev_printk (dev,KERN_INFO ,"detaching (SCSI %s)\n" , -dev_name (&sdev->sdev_gendev)); +ata_dev_info (dev,"detaching (SCSI %s)\n" , +dev_name (&sdev->sdev_gendev));scsi_remove_device (sdev);scsi_device_put (sdev);
drivers/ata/libata-sff.c +16 -16
@@ -227,9 +227,9 @@ int ata_sff_busy_sleep(struct ata_port *ap, }if (status !=0xff && (status &ATA_BUSY )) -ata_port_printk (ap,KERN_WARNING , -"port is slow to respond, please be patient " -"(Status 0x%x)\n" , status); +ata_port_warn (ap, +"port is slow to respond, please be patient (Status 0x%x)\n" , + status); timeout =ata_deadline (timer_start, tmout); while (status != 0xff && (status & ATA_BUSY) &&
@@ -242,9 +242,9 @@ int ata_sff_busy_sleep(struct ata_port *ap,return -ENODEV ;if (status &ATA_BUSY ) { -ata_port_printk (ap,KERN_ERR ,"port failed to respond " -"(%lu secs, Status 0x%x)\n" , -DIV_ROUND_UP (tmout,1000 ), status); +ata_port_err (ap, +"port failed to respond (%lu secs, Status 0x%x)\n" , +DIV_ROUND_UP (tmout,1000 ), status);return -EBUSY ; }
@@ -350,8 +350,8 @@ static void ata_dev_select(struct ata_port *ap, unsigned int device, unsigned int wait, unsigned int can_sleep) { if (ata_msg_probe(ap)) - ata_port_printk(ap, KERN_INFO, "ata_dev_select: ENTER, " - "device %u, wait %u\n", device, wait); + ata_port_info(ap, "ata_dev_select: ENTER, device %u, wait %u\n", + device, wait);if (wait)ata_wait_idle (ap);
@@ -1335,7 +1335,7 @@ void ata_sff_flush_pio_task(struct ata_port *ap) ap->hsm_task_state =HSM_ST_IDLE ;if (ata_msg_ctl (ap)) -ata_port_printk (ap,KERN_DEBUG ,"%s: EXIT\n" , __func__); +ata_port_dbg (ap,"%s: EXIT\n" , __func__); }static void ata_sff_pio_task (struct work_struct *work)
@@ -1513,7 +1513,7 @@ static unsigned int ata_sff_idle_irq(struct ata_port *ap) ap->ops->sff_check_status (ap);if (ap->ops->sff_irq_clear) ap->ops->sff_irq_clear (ap); -ata_port_printk (ap,KERN_WARNING ,"irq trap\n" ); +ata_port_warn (ap,"irq trap\n" ); return 1; }#endif
@@ -1711,7 +1711,7 @@ void ata_sff_lost_interrupt(struct ata_port *ap)/* There was a command running, we are no longer busy and we have no interrupt. */ -ata_port_printk (ap,KERN_WARNING ,"lost interrupt (Status 0x%x)\n" , +ata_port_warn (ap,"lost interrupt (Status 0x%x)\n" , status);/* Run the host interrupt logic as if the interrupt had not been lost */
@@ -1798,8 +1798,9 @@ int ata_sff_prereset(struct ata_link *link, unsigned long deadline)if (!ata_link_offline (link)) { rc =ata_sff_wait_ready (link, deadline);if (rc && rc != -ENODEV ) { -ata_link_printk (link,KERN_WARNING ,"device not ready " -"(errno=%d), forcing hardreset\n" , rc); +ata_link_warn (link, +"device not ready (errno=%d), forcing hardreset\n" , + rc); ehc->i.action |=ATA_EH_HARDRESET ; } }
@@ -2056,7 +2057,7 @@ int ata_sff_softreset(struct ata_link *link, unsigned int *classes, rc =ata_bus_softreset (ap, devmask, deadline);/* if link is occupied, -ENODEV too is an error */ if (rc && (rc != -ENODEV ||sata_scr_valid (link))) { -ata_link_printk (link,KERN_ERR ,"SRST failed (errno=%d)\n" , rc); +ata_link_err (link,"SRST failed (errno=%d)\n" , rc);return rc; }
@@ -2170,8 +2171,7 @@ void ata_sff_drain_fifo(struct ata_queued_cmd *qc)/* Can become DEBUG later */ if (count) -ata_port_printk (ap,KERN_DEBUG , -"drained %d bytes to clear DRQ.\n" , count); +ata_port_dbg (ap,"drained %d bytes to clear DRQ\n" , count); }EXPORT_SYMBOL_GPL (ata_sff_drain_fifo);
drivers/ata/pata_ali.c +4 -4
@@ -287,10 +287,10 @@ static void ali_warn_atapi_dma(struct ata_device *adev)int print_info = ehc->i.flags &ATA_EHI_PRINTINFO ;if (print_info && adev->class ==ATA_DEV_ATAPI && !ali_atapi_dma) { -ata_dev_printk (adev,KERN_WARNING , -"WARNING: ATAPI DMA disabled for reliability issues. It can be enabled\n" ); -ata_dev_printk (adev,KERN_WARNING , -"WARNING: via pata_ali.atapi_dma modparam or corresponding sysfs node.\n" ); +ata_dev_warn (adev, +"WARNING: ATAPI DMA disabled for reliability issues. It can be enabled\n" ); +ata_dev_warn (adev, +"WARNING: via pata_ali.atapi_dma modparam or corresponding sysfs node.\n" ); } }
drivers/ata/pata_amd.c +1 -1
@@ -311,7 +311,7 @@ static unsigned long nv_mode_filter(struct ata_device *dev,cable detection result */ limit |=ata_pack_xfermask (ATA_PIO4 ,ATA_MWDMA2 ,ATA_UDMA2 ); -ata_port_printk (ap,KERN_DEBUG ,"nv_mode_filter: 0x%lx&0x%lx->0x%lx, " +ata_port_dbg (ap,"nv_mode_filter: 0x%lx&0x%lx->0x%lx, " "BIOS=0x%lx (0x%x) ACPI=0x%lx%s\n" , xfer_mask, limit, xfer_mask & limit, bios_limit, saved_udma, acpi_limit, acpi_str);
drivers/ata/pata_bf54x.c +2 -2
@@ -1129,7 +1129,7 @@ static int bfin_softreset(struct ata_link *link, unsigned int *classes,/* issue bus reset */ err_mask =bfin_bus_softreset (ap, devmask);if (err_mask) { -ata_port_printk (ap,KERN_ERR ,"SRST failed (err_mask=0x%x)\n" , +ata_port_err (ap,"SRST failed (err_mask=0x%x)\n" , err_mask);return -EIO ; }
@@ -1382,7 +1382,7 @@ idle_irq:#ifdef ATA_IRQ_TRAP if ((ap->stats.idle_irq %1000 ) ==0 ) { ap->ops->irq_ack (ap,0 );/* debug trap */ -ata_port_printk (ap,KERN_WARNING ,"irq trap\n" ); +ata_port_warn (ap,"irq trap\n" );return 1 ; }#endif
drivers/ata/pata_icside.c +2 -2
@@ -210,8 +210,8 @@ static void pata_icside_set_dmamode(struct ata_port *ap, struct ata_device *adevelse iomd_type ='A' , cycle =562 ; -ata_dev_printk (adev,KERN_INFO ,"timings: act %dns rec %dns cyc %dns (%c)\n" , - t.active, t.recover, t.cycle, iomd_type); +ata_dev_info (adev,"timings: act %dns rec %dns cyc %dns (%c)\n" , + t.active, t.recover, t.cycle, iomd_type); state->port[ap->port_no].speed[adev->devno] = cycle; }
drivers/ata/pata_it821x.c +7 -7
@@ -473,12 +473,12 @@ static int it821x_smart_set_mode(struct ata_link *link, struct ata_device **unus/* We do need the right mode information for DMA or PIO and this comes from the current configuration flags */ if (ata_id_has_dma (dev->id)) { -ata_dev_printk (dev,KERN_INFO ,"configured for DMA\n" ); +ata_dev_info (dev,"configured for DMA\n" ); dev->xfer_mode =XFER_MW_DMA_0 ; dev->xfer_shift =ATA_SHIFT_MWDMA ; dev->flags &= ~ATA_DFLAG_PIO ; }else { -ata_dev_printk (dev,KERN_INFO ,"configured for PIO\n" ); +ata_dev_info (dev,"configured for PIO\n" ); dev->xfer_mode =XFER_PIO_0 ; dev->xfer_shift =ATA_SHIFT_PIO ; dev->flags |=ATA_DFLAG_PIO ;
@@ -508,12 +508,12 @@ static void it821x_dev_config(struct ata_device *adev)if (strstr (model_num,"Integrated Technology Express" )) {/* RAID mode */ -ata_dev_printk (adev,KERN_INFO ,"%sRAID%d volume" , - adev->id[147 ]?"Bootable " :"" , - adev->id[129 ]); +ata_dev_info (adev,"%sRAID%d volume" , + adev->id[147 ] ?"Bootable " :"" , + adev->id[129 ]);if (adev->id[129 ] !=1 ) -printk ("(%dK stripe)" , adev->id[146 ]); -printk (".\n" ); +pr_cont ("(%dK stripe)" , adev->id[146 ]); +pr_cont ("\n" ); }/* This is a controller firmware triggered funny, don't report the drive faulty! */
drivers/ata/pata_ixp4xx_cf.c +1 -1
@@ -31,7 +31,7 @@ static int ixp4xx_set_mode(struct ata_link *link, struct ata_device **error)struct ata_device *dev;ata_for_each_dev (dev, link,ENABLED ) { -ata_dev_printk (dev,KERN_INFO ,"configured for PIO0\n" ); +ata_dev_info (dev,"configured for PIO0\n" ); dev->pio_mode =XFER_PIO_0 ; dev->xfer_mode =XFER_PIO_0 ; dev->xfer_shift =ATA_SHIFT_PIO ;
drivers/ata/pata_legacy.c +1 -1
@@ -213,7 +213,7 @@ static int legacy_set_mode(struct ata_link *link, struct ata_device **unused)struct ata_device *dev;ata_for_each_dev (dev, link,ENABLED ) { -ata_dev_printk (dev,KERN_INFO ,"configured for PIO\n" ); +ata_dev_info (dev,"configured for PIO\n" ); dev->pio_mode =XFER_PIO_0 ; dev->xfer_mode =XFER_PIO_0 ; dev->xfer_shift =ATA_SHIFT_PIO ;
drivers/ata/pata_macio.c +2 -3
@@ -813,7 +813,7 @@ static int pata_macio_slave_config(struct scsi_device *sdev)blk_queue_update_dma_pad (sdev->request_queue,31 );/* Tell the world about it */ -ata_dev_printk (dev,KERN_INFO ,"OHare alignment limits applied\n" ); +ata_dev_info (dev,"OHare alignment limits applied\n" );return 0 ; }
@@ -839,8 +839,7 @@ static int pata_macio_slave_config(struct scsi_device *sdev) cmd | PCI_COMMAND_INVALIDATE);/* Tell the world about it */ -ata_dev_printk (dev,KERN_INFO , -"K2/Shasta alignment limits applied\n" ); +ata_dev_info (dev,"K2/Shasta alignment limits applied\n" ); }return 0 ;
drivers/ata/pata_octeon_cf.c +1 -1
@@ -405,7 +405,7 @@ static int octeon_cf_softreset16(struct ata_link *link, unsigned int *classes, rc =ata_sff_wait_after_reset (link,1 , deadline);if (rc) { -ata_link_printk (link,KERN_ERR ,"SRST failed (errno=%d)\n" , rc); +ata_link_err (link,"SRST failed (errno=%d)\n" , rc);return rc; }
drivers/ata/pata_pcmcia.c +2 -3
@@ -68,7 +68,7 @@ static int pcmcia_set_mode(struct ata_link *link, struct ata_device **r_failed_dthe same vendor - check serial */ if (memcmp (master->id +ATA_ID_SERNO , slave->id +ATA_ID_SERNO ,ATA_ID_SERNO_LEN ) ==0 && master->id[ATA_ID_SERNO ] >>8 ) { -ata_dev_printk (slave,KERN_WARNING ,"is a ghost device, ignoring.\n" ); +ata_dev_warn (slave,"is a ghost device, ignoring\n" );ata_dev_disable (slave); } }
@@ -142,8 +142,7 @@ static void pcmcia_8bit_drain_fifo(struct ata_queued_cmd *qc)ioread8 (ap->ioaddr.data_addr);if (count) -ata_port_printk (ap,KERN_WARNING ,"drained %d bytes to clear DRQ.\n" , - count); +ata_port_warn (ap,"drained %d bytes to clear DRQ\n" , count); }
drivers/ata/pata_platform.c +1 -1
@@ -39,7 +39,7 @@ static int pata_platform_set_mode(struct ata_link *link, struct ata_device **unu dev->pio_mode = dev->xfer_mode =XFER_PIO_0 ; dev->xfer_shift =ATA_SHIFT_PIO ; dev->flags |=ATA_DFLAG_PIO ; -ata_dev_printk (dev,KERN_INFO ,"configured for PIO\n" ); +ata_dev_info (dev,"configured for PIO\n" ); }return 0 ; }
drivers/ata/pata_rz1000.c +1 -1
@@ -44,7 +44,7 @@ static int rz1000_set_mode(struct ata_link *link, struct ata_device **unused) dev->xfer_mode =XFER_PIO_0 ; dev->xfer_shift =ATA_SHIFT_PIO ; dev->flags |=ATA_DFLAG_PIO ; -ata_dev_printk (dev,KERN_INFO ,"configured for PIO\n" ); +ata_dev_info (dev,"configured for PIO\n" ); }return 0 ; }
drivers/ata/pata_samsung_cf.c +1 -1
@@ -376,7 +376,7 @@ static int pata_s3c_softreset(struct ata_link *link, unsigned int *classes, rc =pata_s3c_bus_softreset (ap, deadline);/* if link is occupied, -ENODEV too is an error */ if (rc && rc != -ENODEV ) { -ata_link_printk (link,KERN_ERR ,"SRST failed (errno=%d)\n" , rc); +ata_link_err (link,"SRST failed (errno=%d)\n" , rc);return rc; }
drivers/ata/pata_scc.c +1 -2
@@ -637,8 +637,7 @@ static int scc_softreset(struct ata_link *link, unsigned int *classes,DPRINTK ("about to softreset, devmask=%x\n" , devmask); err_mask =scc_bus_softreset (ap, devmask, deadline);if (err_mask) { -ata_port_printk (ap,KERN_ERR ,"SRST failed (err_mask=0x%x)\n" , - err_mask); +ata_port_err (ap,"SRST failed (err_mask=0x%x)\n" , err_mask);return -EIO ; }
drivers/ata/pata_via.c +2 -2
@@ -350,8 +350,8 @@ static unsigned long via_mode_filter(struct ata_device *dev, unsigned long mask)if (config->id ==PCI_DEVICE_ID_VIA_82C586_0 ) {ata_id_c_string (dev->id, model_num,ATA_ID_PROD ,sizeof (model_num));if (strcmp (model_num,"TS64GSSD25-M" ) ==0 ) { -ata_dev_printk (dev,KERN_WARNING , -"disabling UDMA mode due to reported lockups with this device.\n" ); +ata_dev_warn (dev, +"disabling UDMA mode due to reported lockups with this device\n" ); mask &= ~ATA_MASK_UDMA ; } }
drivers/ata/sata_fsl.c +12 -17
@@ -346,12 +346,11 @@ static unsigned int sata_fsl_fill_sg(struct ata_queued_cmd *qc, void *cmd_desc,/* warn if each s/g element is not dword aligned */ if (sg_addr &0x03 ) -ata_port_printk (qc->ap,KERN_ERR , -"s/g addr unaligned : 0x%llx\n" , - (unsigned long long )sg_addr); +ata_port_err (qc->ap,"s/g addr unaligned : 0x%llx\n" , + (unsigned long long )sg_addr);if (sg_len &0x03 ) -ata_port_printk (qc->ap,KERN_ERR , -"s/g len unaligned : 0x%x\n" , sg_len); +ata_port_err (qc->ap,"s/g len unaligned : 0x%x\n" , + sg_len);if (num_prde == (SATA_FSL_MAX_PRD_DIRECT -1 ) &&sg_next (sg) !=NULL ) {
@@ -739,8 +738,7 @@ try_offline_again: 1, 500);if (temp &ONLINE ) { -ata_port_printk (ap,KERN_ERR , -"Hardreset failed, not off-lined %d\n" , i); +ata_port_err (ap,"Hardreset failed, not off-lined %d\n" , i);/* * Try to offline controller atleast twice
@@ -776,8 +774,7 @@ try_offline_again: temp =ata_wait_register (ap, hcr_base +HSTATUS ,ONLINE ,0 ,1 ,500 );if (!(temp &ONLINE )) { -ata_port_printk (ap,KERN_ERR , -"Hardreset failed, not on-lined\n" ); +ata_port_err (ap,"Hardreset failed, not on-lined\n" ); goto err; }
@@ -793,9 +790,8 @@ try_offline_again: temp =ata_wait_register (ap, hcr_base +HSTATUS ,0xFF ,0 ,1 ,500 );if ((!(temp &0x10 )) ||ata_link_offline (link)) { -ata_port_printk (ap,KERN_WARNING , -"No Device OR PHYRDY change,Hstatus = 0x%x\n" , -ioread32 (hcr_base +HSTATUS )); +ata_port_warn (ap,"No Device OR PHYRDY change,Hstatus = 0x%x\n" , +ioread32 (hcr_base +HSTATUS )); *class =ATA_DEV_NONE ;return 0 ; }
@@ -808,13 +804,12 @@ try_offline_again: 500, jiffies_to_msecs(deadline - start_jiffies));if ((temp &0xFF ) !=0x18 ) { -ata_port_printk (ap,KERN_WARNING ,"No Signature Update\n" ); +ata_port_warn (ap,"No Signature Update\n" ); *class =ATA_DEV_NONE ; goto do_followup_srst; }else { -ata_port_printk (ap,KERN_INFO , -"Signature Update detected @ %d msecs\n" , -jiffies_to_msecs (jiffies - start_jiffies)); +ata_port_info (ap,"Signature Update detected @ %d msecs\n" , +jiffies_to_msecs (jiffies - start_jiffies)); *class =sata_fsl_dev_classify (ap);return 0 ; }
@@ -889,7 +884,7 @@ static int sata_fsl_softreset(struct ata_link *link, unsigned int *class, temp =ata_wait_register (ap,CQ + hcr_base,0x1 ,0x1 ,1 ,5000 );if (temp &0x1 ) { -ata_port_printk (ap,KERN_WARNING ,"ATA_SRST issue failed\n" ); +ata_port_warn (ap,"ATA_SRST issue failed\n" ); DPRINTK("Softreset@5000,CQ=0x%x,CA=0x%x,CC=0x%x\n", ioread32(CQ + hcr_base),
drivers/ata/sata_inic162x.c +8 -7
@@ -396,9 +396,8 @@ static void inic_host_intr(struct ata_port *ap) } spurious: -ata_port_printk (ap,KERN_WARNING ,"unhandled interrupt: " -"cmd=0x%x irq_stat=0x%x idma_stat=0x%x\n" , - qc ? qc->tf.command :0xff , irq_stat, idma_stat); +ata_port_warn (ap,"unhandled interrupt: cmd=0x%x irq_stat=0x%x idma_stat=0x%x\n" , + qc ? qc->tf.command :0xff , irq_stat, idma_stat); }static irqreturn_t inic_interrupt (int irq,void *dev_instance)
@@ -619,8 +618,9 @@ static int inic_hardreset(struct ata_link *link, unsigned int *class, rc =sata_link_resume (link, timing, deadline);if (rc) { -ata_link_printk (link,KERN_WARNING ,"failed to resume " -"link after reset (errno=%d)\n" , rc); +ata_link_warn (link, +"failed to resume link after reset (errno=%d)\n" , + rc);return rc; }
@@ -632,8 +632,9 @@ static int inic_hardreset(struct ata_link *link, unsigned int *class, rc =ata_wait_after_reset (link, deadline, inic_check_ready);/* link occupied, -ENODEV too is an error */ if (rc) { -ata_link_printk (link,KERN_WARNING ,"device not ready " -"after hardreset (errno=%d)\n" , rc); +ata_link_warn (link, +"device not ready after hardreset (errno=%d)\n" , + rc);return rc; }
drivers/ata/sata_mv.c +19 -22
96 lines not on this page · raw message
drivers/ata/sata_nv.c +33 -36
149 lines not on this page · raw message
drivers/ata/sata_sil.c +4 -4
@@ -643,8 +643,8 @@ static void sil_dev_config(struct ata_device *dev) ((ap->flags & SIL_FLAG_MOD15WRITE) && (quirks & SIL_QUIRK_MOD15WRITE))) {if (print_info) -ata_dev_printk (dev,KERN_INFO ,"applying Seagate " -"errata fix (mod15write workaround)\n" ); +ata_dev_info (dev, +"applying Seagate errata fix (mod15write workaround)\n" ); dev->max_sectors =15 ;return ; }
@@ -652,8 +652,8 @@ static void sil_dev_config(struct ata_device *dev)/* limit to udma5 */ if (quirks &SIL_QUIRK_UDMA5MAX ) {if (print_info) -ata_dev_printk (dev,KERN_INFO ,"applying Maxtor " -"errata fix %s\n" , model_num); +ata_dev_info (dev,"applying Maxtor errata fix %s\n" , + model_num); dev->udma_mask &=ATA_UDMA5 ;return ; }
drivers/ata/sata_sil24.c +8 -9
@@ -694,7 +694,7 @@ static int sil24_softreset(struct ata_link *link, unsigned int *class,return 0 ; err: -ata_link_printk (link,KERN_ERR ,"softreset failed (%s)\n" , reason); +ata_link_err (link,"softreset failed (%s)\n" , reason);return -EIO ; }
@@ -714,8 +714,8 @@ static int sil24_hardreset(struct ata_link *link, unsigned int *class,* This happens often after PM DMA CS errata. */ if (pp->do_port_rst) { -ata_port_printk (ap,KERN_WARNING ,"controller in dubious " -"state, performing PORT_RST\n" ); +ata_port_warn (ap, +"controller in dubious state, performing PORT_RST\n" );writel (PORT_CS_PORT_RST , port +PORT_CTRL_STAT );ata_msleep (ap,10 );
@@ -773,7 +773,7 @@ static int sil24_hardreset(struct ata_link *link, unsigned int *class, goto retry; } -ata_link_printk (link,KERN_ERR ,"hardreset failed (%s)\n" , reason); +ata_link_err (link,"hardreset failed (%s)\n" , reason);return -EIO ; }
@@ -925,7 +925,7 @@ static void sil24_pmp_attach(struct ata_port *ap)if (sata_pmp_gscr_vendor (gscr) ==0x11ab &&sata_pmp_gscr_devid (gscr) ==0x4140 ) { -ata_port_printk (ap,KERN_INFO , +ata_port_info (ap,"disabling NCQ support due to sil24-mv4140 quirk\n" ); ap->flags &= ~ATA_FLAG_NCQ ; }
@@ -946,8 +946,7 @@ static int sil24_pmp_hardreset(struct ata_link *link, unsigned int *class, rc =sil24_init_port (link->ap);if (rc) { -ata_link_printk (link,KERN_ERR , -"hardreset failed (port not ready)\n" ); +ata_link_err (link,"hardreset failed (port not ready)\n" );return rc; }
@@ -1141,8 +1140,8 @@ static inline void sil24_host_intr(struct ata_port *ap)/* spurious interrupts are expected if PCIX_IRQ_WOC */ if (!(ap->flags &SIL24_FLAG_PCIX_IRQ_WOC ) &&ata_ratelimit ()) -ata_port_printk (ap,KERN_INFO ,"spurious interrupt " -"(slot_stat 0x%x active_tag %d sactive 0x%x)\n" , +ata_port_info (ap, +"spurious interrupt (slot_stat 0x%x active_tag %d sactive 0x%x)\n" , slot_stat, ap->link.active_tag, ap->link.sactive); }
drivers/ata/sata_via.c +3 -3
@@ -360,9 +360,9 @@ static int vt6420_prereset(struct ata_link *link, unsigned long deadline) online = (sstatus &0xf ) ==0x3 ; -ata_port_printk (ap,KERN_INFO , -"SATA link %s 1.5 Gbps (SStatus %X SControl %X)\n" , - online ?"up" :"down" , sstatus, scontrol); +ata_port_info (ap, +"SATA link %s 1.5 Gbps (SStatus %X SControl %X)\n" , + online ?"up" :"down" , sstatus, scontrol);/* SStatus is read one more time */ svia_scr_read (link,SCR_STATUS , &sstatus);
include/linux/libata.h +42 -14
62 lines not on this page · raw message
Signature · 1 line
1.7.4.2.g597a6.dirty
PATCH 3/4 ata: Add and use ata_print_version_once
In reply to Joe PerchesUse a single mechanism to show driver version.
Reduces text a tiny bit too.
Remove uses of static int printed_version
Add and use ata_print_version(const struct device *, const char *ver) and ata_print_version_once.
$ size drivers/ata/built-in.* text data bss dec hex filename 544969 73893 116584 735446 b38d6 drivers/ata/built-in.allyesconfig.ata.o 543870 73893 116592 734355 b34ad drivers/ata/built-in.allyesconfig.print_once.o 141328 14689 4220 160237 271ed drivers/ata/built-in.defconfig.ata.o 141212 14689 4220 160121 27179 drivers/ata/built-in.defconfig.print_once.o
Signed-off-by Joe Perches <[email protected]>
--- drivers/ata/acard-ahci.c | 4 +--- drivers/ata/ahci.c | 4 +--- drivers/ata/ata_piix.c | 5 +---- drivers/ata/libata-core.c | 6 ++++++ drivers/ata/pata_amd.c | 4 +--- drivers/ata/pata_artop.c | 5 +---- drivers/ata/pata_atp867x.c | 4 +--- drivers/ata/pata_efar.c | 5 +---- drivers/ata/pata_hpt3x3.c | 4 +--- drivers/ata/pata_it8213.c | 5 +---- drivers/ata/pata_ixp4xx_cf.c | 2 +- drivers/ata/pata_mpiix.c | 4 +--- drivers/ata/pata_netcell.c | 5 +---- drivers/ata/pata_ns87415.c | 5 +---- drivers/ata/pata_octeon_cf.c | 6 ++++-- drivers/ata/pata_oldpiix.c | 5 +---- drivers/ata/pata_opti.c | 4 +--- drivers/ata/pata_optidma.c | 4 +--- drivers/ata/pata_pdc2027x.c | 4 +--- drivers/ata/pata_radisys.c | 5 +---- drivers/ata/pata_rdc.c | 5 +---- drivers/ata/pata_rz1000.c | 2 +- drivers/ata/pata_scc.c | 5 +---- drivers/ata/pata_sch.c | 5 +---- drivers/ata/pata_sil680.c | 4 +--- drivers/ata/pata_sis.c | 5 +---- drivers/ata/pata_triflex.c | 4 +--- drivers/ata/pata_via.c | 4 +--- drivers/ata/pdc_adma.c | 4 +--- drivers/ata/sata_inic162x.c | 4 +--- drivers/ata/sata_mv.c | 8 ++------ drivers/ata/sata_nv.c | 4 +--- drivers/ata/sata_promise.c | 4 +--- drivers/ata/sata_qstor.c | 4 +--- drivers/ata/sata_sil.c | 4 +--- drivers/ata/sata_sil24.c | 4 +--- drivers/ata/sata_sis.c | 4 +--- drivers/ata/sata_svw.c | 4 +--- drivers/ata/sata_sx4.c | 4 +--- drivers/ata/sata_uli.c | 4 +--- drivers/ata/sata_via.c | 4 +--- drivers/ata/sata_vsc.c | 4 +--- include/linux/libata.h | 12 ++++++++++++ 43 files changed, 63 insertions(+), 133 deletions(-)
drivers/ata/acard-ahci.c +1 -3
@@ -403,7 +403,6 @@ static int acard_ahci_port_start(struct ata_port *ap)static int acard_ahci_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) { -static int printed_version;unsigned int board_id = ent->driver_data;struct ata_port_info pi = acard_ahci_port_info[board_id];const struct ata_port_info *ppi[] = { &pi,NULL };
@@ -416,8 +415,7 @@ static int acard_ahci_init_one(struct pci_dev *pdev, const struct pci_device_idWARN_ON (ATA_MAX_QUEUE >AHCI_MAX_CMDS ); -if (!printed_version++) -dev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION );/* acquire resources */ rc =pcim_enable_device (pdev);
drivers/ata/ahci.c +1 -3
@@ -1053,7 +1053,6 @@ static inline void ahci_gtf_filter_workaround(struct ata_host *host)static int ahci_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) { -static int printed_version;unsigned int board_id = ent->driver_data;struct ata_port_info pi = ahci_port_info[board_id];const struct ata_port_info *ppi[] = { &pi,NULL };
@@ -1066,8 +1065,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)WARN_ON ((int )ATA_MAX_QUEUE >AHCI_MAX_CMDS ); -if (!printed_version++) -dev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION );/* The AHCI driver can only drive the SATA ports, the PATA driver can drive them all so if both drivers are selected make sure
drivers/ata/ata_piix.c +1 -4
@@ -1554,7 +1554,6 @@ static bool piix_broken_system_poweroff(struct pci_dev *pdev)static int __devinit piix_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) { -static int printed_version;struct device *dev = &pdev->dev;struct ata_port_info port_info[2 ];const struct ata_port_info *ppi[] = { &port_info[0 ], &port_info[1 ] };
@@ -1564,9 +1563,7 @@ static int __devinit piix_init_one(struct pci_dev *pdev,struct piix_host_priv *hpriv;int rc; -if (!printed_version++) -dev_printk (KERN_DEBUG , &pdev->dev, -"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION );/* no hotplugging support for later devices (FIXME) */ if (!in_module_init && ent->driver_data >= ich5_sata)
drivers/ata/libata-core.c +6 -0
@@ -6640,6 +6640,12 @@ int ata_dev_printk(const struct ata_device *dev, const char *level, }EXPORT_SYMBOL (ata_dev_printk); +void ata_print_version (const struct device *dev,const char *version) +{ +dev_printk (KERN_DEBUG , dev,"version %s\n" , version); +} +EXPORT_SYMBOL (ata_print_version); +/* * libata is essentially a library of internal helper functions for * low-level ATA host controller drivers. As such, the API/ABI is
drivers/ata/pata_amd.c +1 -3
@@ -530,14 +530,12 @@ static int amd_init_one(struct pci_dev *pdev, const struct pci_device_id *id) } };const struct ata_port_info *ppi[] = {NULL ,NULL }; -static int printed_version;int type = id->driver_data;void *hpriv =NULL ;u8 fifo;int rc; -if (!printed_version++) -dev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION ); rc =pcim_enable_device (pdev);if (rc)
drivers/ata/pata_artop.c +1 -4
@@ -346,7 +346,6 @@ static struct ata_port_operations artop6260_ops = {static int artop_init_one (struct pci_dev *pdev,const struct pci_device_id *id) { -static int printed_version;static const struct ata_port_info info_6210 = { .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =ATA_PIO4 ,
@@ -378,9 +377,7 @@ static int artop_init_one (struct pci_dev *pdev, const struct pci_device_id *id)const struct ata_port_info *ppi[] = {NULL ,NULL };int rc; -if (!printed_version++) -dev_printk (KERN_DEBUG , &pdev->dev, -"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION ); rc =pcim_enable_device (pdev);if (rc)
drivers/ata/pata_atp867x.c +1 -3
@@ -487,7 +487,6 @@ static int atp867x_ata_pci_sff_init_host(struct ata_host *host)static int atp867x_init_one (struct pci_dev *pdev,const struct pci_device_id *id) { -static int printed_version;static const struct ata_port_info info_867x = { .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =ATA_PIO4 ,
@@ -499,8 +498,7 @@ static int atp867x_init_one(struct pci_dev *pdev,const struct ata_port_info *ppi[] = { &info_867x,NULL };int rc; -if (!printed_version++) -dev_info (&pdev->dev,"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION ); rc =pcim_enable_device (pdev);if (rc)
drivers/ata/pata_efar.c +1 -4
@@ -263,7 +263,6 @@ static struct ata_port_operations efar_ops = {static int efar_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) { -static int printed_version;static const struct ata_port_info info = { .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =ATA_PIO4 ,
@@ -273,9 +272,7 @@ static int efar_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) };const struct ata_port_info *ppi[] = { &info, &info }; -if (!printed_version++) -dev_printk (KERN_DEBUG , &pdev->dev, -"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION );return ata_pci_bmdma_init_one (pdev, ppi, &efar_sht,NULL ,ATA_HOST_PARALLEL_SCAN );
drivers/ata/pata_hpt3x3.c +1 -3
@@ -185,7 +185,6 @@ static void hpt3x3_init_chipset(struct pci_dev *dev)static int hpt3x3_init_one (struct pci_dev *pdev,const struct pci_device_id *id) { -static int printed_version;static const struct ata_port_info info = { .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =ATA_PIO4 ,
@@ -206,8 +205,7 @@ static int hpt3x3_init_one(struct pci_dev *pdev, const struct pci_device_id *id)hpt3x3_init_chipset (pdev); -if (!printed_version++) -dev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION ); host =ata_host_alloc_pinfo (&pdev->dev, ppi,2 );if (!host)
drivers/ata/pata_it8213.c +1 -4
@@ -258,7 +258,6 @@ static struct ata_port_operations it8213_ops = {static int it8213_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) { -static int printed_version;static const struct ata_port_info info = { .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =ATA_PIO4 ,
@@ -269,9 +268,7 @@ static int it8213_init_one (struct pci_dev *pdev, const struct pci_device_id *en/* Current IT8213 stuff is single port */ const struct ata_port_info *ppi[] = { &info, &ata_dummy_port_info }; -if (!printed_version++) -dev_printk (KERN_DEBUG , &pdev->dev, -"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION );return ata_pci_bmdma_init_one (pdev, ppi, &it8213_sht,NULL ,0 ); }
drivers/ata/pata_ixp4xx_cf.c +1 -1
@@ -181,7 +181,7 @@ static __devinit int ixp4xx_pata_probe(struct platform_device *pdev)ixp4xx_setup_port (ap, data, cs0->start, cs1->start); -dev_info (&pdev->dev,"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION );/* activate host */ return ata_host_activate (host, irq, ata_sff_interrupt,0 , &ixp4xx_sht);
drivers/ata/pata_mpiix.c +1 -3
@@ -152,15 +152,13 @@ static struct ata_port_operations mpiix_port_ops = {static int mpiix_init_one (struct pci_dev *dev,const struct pci_device_id *id) {/* Single threaded by the PCI probe logic */ -static int printed_version;struct ata_host *host;struct ata_port *ap;void __iomem *cmd_addr, *ctl_addr;u16 idetim;int cmd, ctl, irq; -if (!printed_version++) -dev_printk (KERN_DEBUG , &dev->dev,"version " DRV_VERSION "\n" ); +ata_print_version_once (&dev->dev,DRV_VERSION ); host =ata_host_alloc (&dev->dev,1 );if (!host)
drivers/ata/pata_netcell.c +1 -4
@@ -57,7 +57,6 @@ static struct ata_port_operations netcell_ops = {static int netcell_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) { -static int printed_version;static const struct ata_port_info info = { .flags =ATA_FLAG_SLAVE_POSS ,/* Actually we don't really care about these as the
@@ -70,9 +69,7 @@ static int netcell_init_one (struct pci_dev *pdev, const struct pci_device_id *econst struct ata_port_info *port_info[] = { &info,NULL };int rc; -if (!printed_version++) -dev_printk (KERN_DEBUG , &pdev->dev, -"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION ); rc =pcim_enable_device (pdev);if (rc)
drivers/ata/pata_ns87415.c +1 -4
@@ -350,7 +350,6 @@ static void ns87415_fixup(struct pci_dev *pdev)static int ns87415_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) { -static int printed_version;static const struct ata_port_info info = { .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =ATA_PIO4 ,
@@ -370,9 +369,7 @@ static int ns87415_init_one (struct pci_dev *pdev, const struct pci_device_id *eif (PCI_SLOT (pdev->devfn) ==0x0E ) ppi[0 ] = &info87560;#endif -if (!printed_version++) -dev_printk (KERN_DEBUG , &pdev->dev, -"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION ); rc =pcim_enable_device (pdev);if (rc)
drivers/ata/pata_octeon_cf.c +4 -2
@@ -807,6 +807,7 @@ static int __devinit octeon_cf_probe(struct platform_device *pdev)irq_handler_t irq_handler =NULL ;void __iomem *base;struct octeon_cf_port *cf_port; +char version[32 ]; res_cs0 =platform_get_resource (pdev,IORESOURCE_MEM ,0 );
@@ -905,10 +906,11 @@ static int __devinit octeon_cf_probe(struct platform_device *pdev)ata_port_desc (ap,"cmd %p ctl %p" , base, ap->ioaddr.ctl_addr); -dev_info (&pdev->dev,"version " DRV_VERSION " %d bit%s.\n" , +snprintf (version,sizeof (version),"%s %d bit%s" , +DRV_VERSION , (ocd->is16bit) ?16 :8 , (cs1) ?", True IDE" :"" ); - +ata_print_version_once (&pdev->dev, version);return ata_host_activate (host, irq, irq_handler,0 , &octeon_cf_sht);
drivers/ata/pata_oldpiix.c +1 -4
@@ -235,7 +235,6 @@ static struct ata_port_operations oldpiix_pata_ops = {static int oldpiix_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) { -static int printed_version;static const struct ata_port_info info = { .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =ATA_PIO4 ,
@@ -244,9 +243,7 @@ static int oldpiix_init_one (struct pci_dev *pdev, const struct pci_device_id *e };const struct ata_port_info *ppi[] = { &info,NULL }; -if (!printed_version++) -dev_printk (KERN_DEBUG , &pdev->dev, -"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION );return ata_pci_bmdma_init_one (pdev, ppi, &oldpiix_sht,NULL ,0 ); }
drivers/ata/pata_opti.c +1 -3
@@ -167,10 +167,8 @@ static int opti_init_one(struct pci_dev *dev, const struct pci_device_id *id) .port_ops = &opti_port_ops };const struct ata_port_info *ppi[] = { &info,NULL }; -static int printed_version; -if (!printed_version++) -dev_printk (KERN_DEBUG , &dev->dev,"version " DRV_VERSION "\n" ); +ata_print_version_once (&dev->dev,DRV_VERSION );return ata_pci_sff_init_one (dev, ppi, &opti_sht,NULL ,0 ); }
drivers/ata/pata_optidma.c +1 -3
@@ -411,11 +411,9 @@ static int optidma_init_one(struct pci_dev *dev, const struct pci_device_id *id) .port_ops = &optiplus_port_ops };const struct ata_port_info *ppi[] = { &info_82c700,NULL }; -static int printed_version;int rc; -if (!printed_version++) -dev_printk (KERN_DEBUG , &dev->dev,"version " DRV_VERSION "\n" ); +ata_print_version_once (&dev->dev,DRV_VERSION ); rc =pcim_enable_device (dev);if (rc)
drivers/ata/pata_pdc2027x.c +1 -3
@@ -697,7 +697,6 @@ static void pdc_ata_setup_port(struct ata_ioports *port, void __iomem *base)*/ static int __devinit pdc2027x_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) { -static int printed_version;static const unsigned long cmd_offset[] = {0x17c0 ,0x15c0 };static const unsigned long bmdma_offset[] = {0x1000 ,0x1008 };unsigned int board_idx = (unsigned int ) ent->driver_data;
@@ -707,8 +706,7 @@ static int __devinit pdc2027x_init_one(struct pci_dev *pdev, const struct pci_devoid __iomem *mmio_base;int i, rc; -if (!printed_version++) -dev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION );/* alloc host */ host =ata_host_alloc_pinfo (&pdev->dev, ppi,2 );
drivers/ata/pata_radisys.c +1 -4
@@ -213,7 +213,6 @@ static struct ata_port_operations radisys_pata_ops = {static int radisys_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) { -static int printed_version;static const struct ata_port_info info = { .flags =ATA_FLAG_SLAVE_POSS , .pio_mask =ATA_PIO4 ,
@@ -223,9 +222,7 @@ static int radisys_init_one (struct pci_dev *pdev, const struct pci_device_id *e };const struct ata_port_info *ppi[] = { &info,NULL }; -if (!printed_version++) -dev_printk (KERN_DEBUG , &pdev->dev, -"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION );return ata_pci_bmdma_init_one (pdev, ppi, &radisys_sht,NULL ,0 ); }
drivers/ata/pata_rdc.c +1 -4
@@ -312,7 +312,6 @@ static struct scsi_host_template rdc_sht = {static int __devinit rdc_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) { -static int printed_version;struct device *dev = &pdev->dev;struct ata_port_info port_info[2 ];const struct ata_port_info *ppi[] = { &port_info[0 ], &port_info[1 ] };
@@ -321,9 +320,7 @@ static int __devinit rdc_init_one(struct pci_dev *pdev,struct rdc_host_priv *hpriv;int rc; -if (!printed_version++) -dev_printk (KERN_DEBUG , &pdev->dev, -"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION ); port_info[0 ] = rdc_port_info; port_info[1 ] = rdc_port_info;
drivers/ata/pata_rz1000.c +1 -1
@@ -92,7 +92,7 @@ static int rz1000_init_one (struct pci_dev *pdev, const struct pci_device_id *en };const struct ata_port_info *ppi[] = { &info,NULL }; - printk_once(KERN_DEBUG DRV_NAME " version " DRV_VERSION "\n"); +ata_print_version_once (&pdev->dev,DRV_VERSION );if (rz1000_fifo_disable (pdev) ==0 )return ata_pci_sff_init_one (pdev, ppi, &rz1000_sht,NULL ,0 );
drivers/ata/pata_scc.c +1 -4
@@ -1071,15 +1071,12 @@ static int scc_host_init(struct ata_host *host)static int scc_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) { -static int printed_version;unsigned int board_idx = (unsigned int ) ent->driver_data;const struct ata_port_info *ppi[] = { &scc_port_info[board_idx],NULL };struct ata_host *host;int rc; -if (!printed_version++) -dev_printk (KERN_DEBUG , &pdev->dev, -"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION ); host =ata_host_alloc_pinfo (&pdev->dev, ppi,1 );if (!host)
drivers/ata/pata_sch.c +1 -4
@@ -172,12 +172,9 @@ static void sch_set_dmamode(struct ata_port *ap, struct ata_device *adev)static int __devinit sch_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) { -static int printed_version;const struct ata_port_info *ppi[] = { &sch_port_info,NULL }; -if (!printed_version++) -dev_printk (KERN_DEBUG , &pdev->dev, -"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION );return ata_pci_bmdma_init_one (pdev, ppi, &sch_sht,NULL ,0 ); }
drivers/ata/pata_sil680.c +1 -3
@@ -327,13 +327,11 @@ static int __devinit sil680_init_one(struct pci_dev *pdev, .port_ops = &sil680_port_ops };const struct ata_port_info *ppi[] = { &info,NULL }; -static int printed_version;struct ata_host *host;void __iomem *mmio_base;int rc, try_mmio; -if (!printed_version++) -dev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION ); rc =pcim_enable_device (pdev);if (rc)
drivers/ata/pata_sis.c +1 -4
@@ -681,7 +681,6 @@ static void sis_fixup(struct pci_dev *pdev, struct sis_chipset *sis)static int sis_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) { -static int printed_version;const struct ata_port_info *ppi[] = {NULL ,NULL };struct pci_dev *host =NULL ;struct sis_chipset *chipset =NULL ;
@@ -735,9 +734,7 @@ static int sis_init_one (struct pci_dev *pdev, const struct pci_device_id *ent) 0x0, &sis_info100 }; -if (!printed_version++) -dev_printk (KERN_DEBUG , &pdev->dev, -"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION ); rc =pcim_enable_device (pdev);if (rc)
drivers/ata/pata_triflex.c +1 -3
@@ -196,10 +196,8 @@ static int triflex_init_one(struct pci_dev *dev, const struct pci_device_id *id) .port_ops = &triflex_port_ops };const struct ata_port_info *ppi[] = { &info,NULL }; -static int printed_version; -if (!printed_version++) -dev_printk (KERN_DEBUG , &dev->dev,"version " DRV_VERSION "\n" ); +ata_print_version_once (&dev->dev,DRV_VERSION );return ata_pci_bmdma_init_one (dev, ppi, &triflex_sht,NULL ,0 ); }
drivers/ata/pata_via.c +1 -3
@@ -551,14 +551,12 @@ static int via_init_one(struct pci_dev *pdev, const struct pci_device_id *id)const struct ata_port_info *ppi[] = {NULL ,NULL };struct pci_dev *isa;const struct via_isa_bridge *config; -static int printed_version;u8 enable;u32 timing;unsigned long flags = id->driver_data;int rc; -if (!printed_version++) -dev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION ); rc =pcim_enable_device (pdev);if (rc)
drivers/ata/pdc_adma.c +1 -3
@@ -610,15 +610,13 @@ static int adma_set_dma_masks(struct pci_dev *pdev, void __iomem *mmio_base)static int adma_ata_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) { -static int printed_version;unsigned int board_idx = (unsigned int ) ent->driver_data;const struct ata_port_info *ppi[] = { &adma_port_info[board_idx],NULL };struct ata_host *host;void __iomem *mmio_base;int rc, port_no; -if (!printed_version++) -dev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION );/* alloc host */ host =ata_host_alloc_pinfo (&pdev->dev, ppi,ADMA_PORTS );
drivers/ata/sata_inic162x.c +1 -3
@@ -800,7 +800,6 @@ static int inic_pci_device_resume(struct pci_dev *pdev)static int inic_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) { -static int printed_version;const struct ata_port_info *ppi[] = { &inic_port_info,NULL };struct ata_host *host;struct inic_host_priv *hpriv;
@@ -808,8 +807,7 @@ static int inic_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)int mmio_bar;int i, rc; -if (!printed_version++) -dev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION );/* alloc host */ host =ata_host_alloc_pinfo (&pdev->dev, ppi,NR_PORTS );
drivers/ata/sata_mv.c +2 -6
@@ -4018,7 +4018,6 @@ static void mv_conf_mbus_windows(struct mv_host_priv *hpriv,*/ static int mv_platform_probe (struct platform_device *pdev) { -static int printed_version;const struct mv_sata_platform_data *mv_platform_data;const struct ata_port_info *ppi[] = { &mv_port_info[chip_soc],NULL };
@@ -4027,8 +4026,7 @@ static int mv_platform_probe(struct platform_device *pdev)struct resource *res;int n_ports, rc; -if (!printed_version++) -dev_info (&pdev->dev,"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION );/* * Simple resource validation ..
@@ -4285,15 +4283,13 @@ static void mv_print_info(struct ata_host *host)static int mv_pci_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) { -static int printed_version;unsigned int board_idx = (unsigned int )ent->driver_data;const struct ata_port_info *ppi[] = { &mv_port_info[board_idx],NULL };struct ata_host *host;struct mv_host_priv *hpriv;int n_ports, port, rc; -if (!printed_version++) -dev_info (&pdev->dev,"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION );/* allocate host */ n_ports =mv_get_hc_count (ppi[0 ]->flags) *MV_PORTS_PER_HC ;
drivers/ata/sata_nv.c +1 -3
@@ -2353,7 +2353,6 @@ static irqreturn_t nv_swncq_interrupt(int irq, void *dev_instance)static int nv_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) { -static int printed_version;const struct ata_port_info *ppi[] = {NULL ,NULL };struct nv_pi_priv *ipriv;struct ata_host *host;
@@ -2370,8 +2369,7 @@ static int nv_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)if (pci_resource_start (pdev, bar) ==0 )return -ENODEV ; -if (!printed_version++) -dev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION ); rc =pcim_enable_device (pdev);if (rc)
drivers/ata/sata_promise.c +1 -3
@@ -1179,7 +1179,6 @@ static void pdc_host_init(struct ata_host *host)static int pdc_ata_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) { -static int printed_version;const struct ata_port_info *pi = &pdc_port_info[ent->driver_data];const struct ata_port_info *ppi[PDC_MAX_PORTS ];struct ata_host *host;
@@ -1187,8 +1186,7 @@ static int pdc_ata_init_one(struct pci_dev *pdev,int n_ports, i, rc;int is_sataii_tx4; -if (!printed_version++) -dev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION );/* enable and acquire resources */ rc =pcim_enable_device (pdev);
drivers/ata/sata_qstor.c +1 -3
@@ -587,14 +587,12 @@ static int qs_set_dma_masks(struct pci_dev *pdev, void __iomem *mmio_base)static int qs_ata_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) { -static int printed_version;unsigned int board_idx = (unsigned int ) ent->driver_data;const struct ata_port_info *ppi[] = { &qs_port_info[board_idx],NULL };struct ata_host *host;int rc, port_no; -if (!printed_version++) -dev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION );/* alloc host */ host =ata_host_alloc_pinfo (&pdev->dev, ppi,QS_PORTS );
drivers/ata/sata_sil.c +1 -3
@@ -732,7 +732,6 @@ static bool sil_broken_system_poweroff(struct pci_dev *pdev)static int sil_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) { -static int printed_version;int board_id = ent->driver_data;struct ata_port_info pi = sil_port_info[board_id];const struct ata_port_info *ppi[] = { &pi,NULL };
@@ -741,8 +740,7 @@ static int sil_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)int n_ports, rc;unsigned int i; -if (!printed_version++) -dev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION );/* allocate host */ n_ports =2 ;
drivers/ata/sata_sil24.c +1 -3
@@ -1270,7 +1270,6 @@ static void sil24_init_controller(struct ata_host *host)static int sil24_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) {extern int __MARKER__sil24_cmd_block_is_sized_wrongly; -static int printed_version;struct ata_port_info pi = sil24_port_info[ent->driver_data];const struct ata_port_info *ppi[] = { &pi,NULL };void __iomem *const *iomap;
@@ -1282,8 +1281,7 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)if (sizeof (union sil24_cmd_block ) !=PAGE_SIZE ) __MARKER__sil24_cmd_block_is_sized_wrongly =1 ; -if (!printed_version++) -dev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION );/* acquire resources */ rc =pcim_enable_device (pdev);
drivers/ata/sata_sis.c +1 -3
@@ -193,7 +193,6 @@ static int sis_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val)static int sis_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) { -static int printed_version;struct ata_port_info pi = sis_port_info;const struct ata_port_info *ppi[] = { &pi, &pi };struct ata_host *host;
@@ -202,8 +201,7 @@ static int sis_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)u8 port2_start =0x20 ;int i, rc; -if (!printed_version++) -dev_info (&pdev->dev,"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION ); rc =pcim_enable_device (pdev);if (rc)
drivers/ata/sata_svw.c +1 -3
@@ -414,15 +414,13 @@ static void k2_sata_setup_port(struct ata_ioports *port, void __iomem *base)static int k2_sata_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) { -static int printed_version;const struct ata_port_info *ppi[] = { &k2_port_info[ent->driver_data],NULL };struct ata_host *host;void __iomem *mmio_base;int n_ports, i, rc, bar_pos; -if (!printed_version++) -dev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION );/* allocate host */ n_ports =4 ;
drivers/ata/sata_sx4.c +1 -3
@@ -1440,15 +1440,13 @@ static void pdc_20621_init(struct ata_host *host)static int pdc_sata_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) { -static int printed_version;const struct ata_port_info *ppi[] = { &pdc_port_info[ent->driver_data],NULL };struct ata_host *host;struct pdc_host_priv *hpriv;int i, rc; -if (!printed_version++) -dev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION );/* allocate host */ host =ata_host_alloc_pinfo (&pdev->dev, ppi,4 );
drivers/ata/sata_uli.c +1 -3
@@ -145,7 +145,6 @@ static int uli_scr_write(struct ata_link *link, unsigned int sc_reg, u32 val)static int uli_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) { -static int printed_version;const struct ata_port_info *ppi[] = { &uli_port_info,NULL };unsigned int board_idx = (unsigned int ) ent->driver_data;struct ata_host *host;
@@ -154,8 +153,7 @@ static int uli_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)struct ata_ioports *ioaddr;int n_ports, rc; -if (!printed_version++) -dev_info (&pdev->dev,"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION ); rc =pcim_enable_device (pdev);if (rc)
drivers/ata/sata_via.c +1 -3
@@ -606,15 +606,13 @@ static void svia_configure(struct pci_dev *pdev, int board_id)static int svia_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) { -static int printed_version;unsigned int i;int rc;struct ata_host *host =NULL ;int board_id = (int ) ent->driver_data;const unsigned *bar_sizes; -if (!printed_version++) -dev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION ); rc =pcim_enable_device (pdev);if (rc)
drivers/ata/sata_vsc.c +1 -3
@@ -346,14 +346,12 @@ static int __devinit vsc_sata_init_one(struct pci_dev *pdev, .port_ops = &vsc_sata_ops, };const struct ata_port_info *ppi[] = { &pi,NULL }; -static int printed_version;struct ata_host *host;void __iomem *mmio_base;int i, rc;u8 cls; -if (!printed_version++) -dev_printk (KERN_DEBUG , &pdev->dev,"version " DRV_VERSION "\n" ); +ata_print_version_once (&pdev->dev,DRV_VERSION );/* allocate host */ host =ata_host_alloc_pinfo (&pdev->dev, ppi,4 );
include/linux/libata.h +12 -0
@@ -74,6 +74,16 @@ #define BPRINTK(fmt, args...) if (ap->flags & ATA_FLAG_DEBUGMSG) printk(KERN_ERR "%s: " fmt, __func__, ## args) +#define ata_print_version_once (dev, version) \ +({ \ + static bool __print_once; \ + \ + if (!__print_once) { \ + __print_once = true; \ + ata_print_version(dev, version); \ + } \ +}) +/* NEW: debug levels */ #define HAVE_LIBATA_MSG 1
@@ -1287,6 +1297,8 @@ int ata_dev_printk(const struct ata_device *dev, const char *level,#define ata_dev_dbg (dev, fmt, ...) \ ata_dev_printk(dev, KERN_DEBUG, fmt, ##__VA_ARGS__) +void ata_print_version (const struct device *dev,const char *version); +/* * ata_eh_info helpers */
Signature · 1 line
1.7.4.2.g597a6.dirty
Re: [PATCH 3/4] ata: Add and use ata_print_version_once
Quoted 6 lines · Joe Perches
Use a single mechanism to show driver version.
Reduces text a tiny bit too.Remove uses of static int
printed_version
Add and useata_print_version(const struct device *, const char *ver)andata_print_version_once.
any idea why we really need this driver version for in-kernel drivers? isn't the kernel version good enough?
saeed
Re: [PATCH 3/4] ata: Add and use ata_print_version_once
Quoted 8 lines · saeed bishara
Quoted 5 lines · Joe Perches
Use a single mechanism to show driver version.
Reduces text a tiny bit too.
Remove uses of static intprinted_version
Add and useata_print_version(const struct device *, const char *ver)andata_print_version_once.any idea why we really need this driver version for in-kernel drivers? isn't the kernel version good enough?
Some think it useful to see what module
version is linked against the kernel.
Re: [PATCH 3/4] ata: Add and use ata_print_version_once
Quoted 7 lines · Joe Perches
Quoted 6 lines · saeed bishara
Quoted 5 lines · Joe Perches
Use a single mechanism to show driver version.
Reduces text a tiny bit too.
Remove uses of static intprinted_version
Add and useata_print_version(const struct device *, const char *ver)andata_print_version_once.
Quoted 5 lines
Quoted 2 lines
any idea why we really need this driver version for in-kernel drivers? isn't the kernel version good enough?
Some think it useful to see what module
version is linked against the kernel.
1. I looked at 3-4 drivers, and found that it didn't modified its version since at least 3 years, so it doesn't look to me that this version is maintained properly.
2. anyway, if you still think this feature is needed, then maybe you should consider making it generic one, this is not ata specific feature.
saeed
PATCH 4/4 ata: sata_via: Use dev_dbg
In reply to Joe PerchesUse normal debugging path for dynamic debug capability.
Convert dev_printk(KERN_DEBUG to dev_dbg(
Signed-off-by Joe Perches <[email protected]>
--- drivers/ata/sata_via.c | 16 +++++++--------- 1 files changed, 7 insertions(+), 9 deletions(-)
drivers/ata/sata_via.c +7 -9
@@ -548,9 +548,8 @@ static void svia_configure(struct pci_dev *pdev, int board_id)/* make sure SATA channels are enabled */ pci_read_config_byte (pdev,SATA_CHAN_ENAB , &tmp8);if ((tmp8 &ALL_PORTS ) !=ALL_PORTS ) { -dev_printk (KERN_DEBUG , &pdev->dev, -"enabling SATA channels (0x%x)\n" , - (int ) tmp8); +dev_dbg (&pdev->dev,"enabling SATA channels (0x%x)\n" , + (int )tmp8); tmp8 |=ALL_PORTS ;pci_write_config_byte (pdev,SATA_CHAN_ENAB , tmp8); }
@@ -558,9 +557,8 @@ static void svia_configure(struct pci_dev *pdev, int board_id)/* make sure interrupts for each channel sent to us */ pci_read_config_byte (pdev,SATA_INT_GATE , &tmp8);if ((tmp8 &ALL_PORTS ) !=ALL_PORTS ) { -dev_printk (KERN_DEBUG , &pdev->dev, -"enabling SATA channel interrupts (0x%x)\n" , - (int ) tmp8); +dev_dbg (&pdev->dev,"enabling SATA channel interrupts (0x%x)\n" , + (int ) tmp8); tmp8 |=ALL_PORTS ;pci_write_config_byte (pdev,SATA_INT_GATE , tmp8); }
@@ -568,9 +566,9 @@ static void svia_configure(struct pci_dev *pdev, int board_id)/* make sure native mode is enabled */ pci_read_config_byte (pdev,SATA_NATIVE_MODE , &tmp8);if ((tmp8 &NATIVE_MODE_ALL ) !=NATIVE_MODE_ALL ) { -dev_printk (KERN_DEBUG , &pdev->dev, -"enabling SATA channel native mode (0x%x)\n" , - (int ) tmp8); +dev_dbg (&pdev->dev, +"enabling SATA channel native mode (0x%x)\n" , + (int ) tmp8); tmp8 |=NATIVE_MODE_ALL ;pci_write_config_byte (pdev,SATA_NATIVE_MODE , tmp8); }
Signature · 1 line
1.7.4.2.g597a6.dirty
Quoted 8 lines · Joe Perches
Neaten the code and shrink the text used about 5% or so for an x86 defconfig.
Joe Perches (4):
ata: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
ata: Convert ata_<foo>_printk(KERN_<LEVEL> to ata_<foo>_<level>(
ata: Add and useata_print_version_once
ata:sata_via: Usedev_dbg
ping?
Quoted 65 lines
drivers/ata/acard-ahci.c | 27 ++-- drivers/ata/ahci.c | 53 +++--- drivers/ata/ata_generic.c | 5 +- drivers/ata/ata_piix.c | 44 +++--- drivers/ata/libahci.c | 95 +++++------ drivers/ata/libata-acpi.c | 66 +++---- drivers/ata/libata-core.c | 400 +++++++++++++++++++++++------------------ drivers/ata/libata-eh.c | 143 +++++++-------- drivers/ata/libata-pmp.c | 123 ++++++------- drivers/ata/libata-scsi.c | 22 +-- drivers/ata/libata-sff.c | 52 +++--- drivers/ata/pata_ali.c | 8 +- drivers/ata/pata_amd.c | 8 +- drivers/ata/pata_artop.c | 5 +- drivers/ata/pata_atp867x.c | 13 +- drivers/ata/pata_bf54x.c | 4 +- drivers/ata/pata_cs5520.c | 3 +- drivers/ata/pata_efar.c | 5 +- drivers/ata/pata_hpt3x3.c | 4 +- drivers/ata/pata_icside.c | 4 +- drivers/ata/pata_it8213.c | 5 +- drivers/ata/pata_it821x.c | 14 +- drivers/ata/pata_ixp4xx_cf.c | 4 +- drivers/ata/pata_legacy.c | 2 +- drivers/ata/pata_macio.c | 10 +- drivers/ata/pata_mpiix.c | 4 +- drivers/ata/pata_netcell.c | 5 +- drivers/ata/pata_ns87410.c | 2 +- drivers/ata/pata_ns87415.c | 5 +- drivers/ata/pata_octeon_cf.c | 8 +- drivers/ata/pata_oldpiix.c | 5 +- drivers/ata/pata_opti.c | 4 +- drivers/ata/pata_optidma.c | 4 +- drivers/ata/pata_pcmcia.c | 5 +- drivers/ata/pata_pdc2027x.c | 6 +- drivers/ata/pata_platform.c | 2 +- drivers/ata/pata_radisys.c | 5 +- drivers/ata/pata_rdc.c | 5 +- drivers/ata/pata_rz1000.c | 4 +- drivers/ata/pata_samsung_cf.c | 2 +- drivers/ata/pata_scc.c | 8 +- drivers/ata/pata_sch.c | 5 +- drivers/ata/pata_sil680.c | 4 +- drivers/ata/pata_sis.c | 5 +- drivers/ata/pata_sl82c105.c | 6 +- drivers/ata/pata_triflex.c | 4 +- drivers/ata/pata_via.c | 8 +- drivers/ata/pdc_adma.c | 10 +- drivers/ata/sata_fsl.c | 43 ++--- drivers/ata/sata_inic162x.c | 31 ++-- drivers/ata/sata_mv.c | 94 +++++------ drivers/ata/sata_nv.c | 79 ++++----- drivers/ata/sata_promise.c | 6 +- drivers/ata/sata_qstor.c | 13 +- drivers/ata/sata_sil.c | 21 +-- drivers/ata/sata_sil24.c | 43 ++--- drivers/ata/sata_sis.c | 26 ++-- drivers/ata/sata_svw.c | 4 +- drivers/ata/sata_sx4.c | 4 +- drivers/ata/sata_uli.c | 4 +- drivers/ata/sata_via.c | 42 ++--- drivers/ata/sata_vsc.c | 9 +- include/linux/libata.h | 68 ++++++-- 63 files changed, 821 insertions(+), 901 deletions(-)