diff options
author | Joe Perches <joe@perches.com> | 2011-04-15 18:52:00 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2011-07-23 17:57:36 -0400 |
commit | 06296a1e684bcd40b9a28d5d8030809e4295528b (patch) | |
tree | 474fcc8507fb11107e9e5de885217396a12d99f1 /drivers/ata/sata_mv.c | |
parent | a9a79dfec239568bdbf778242f8fcd10bcc5b9e2 (diff) |
ata: Add and use ata_print_version_once
Use 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 <joe@perches.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
Diffstat (limited to 'drivers/ata/sata_mv.c')
-rw-r--r-- | drivers/ata/sata_mv.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c index b0e45d29244f..4b6b2090784b 100644 --- a/drivers/ata/sata_mv.c +++ b/drivers/ata/sata_mv.c | |||
@@ -4018,7 +4018,6 @@ static void mv_conf_mbus_windows(struct mv_host_priv *hpriv, | |||
4018 | */ | 4018 | */ |
4019 | static int mv_platform_probe(struct platform_device *pdev) | 4019 | static int mv_platform_probe(struct platform_device *pdev) |
4020 | { | 4020 | { |
4021 | static int printed_version; | ||
4022 | const struct mv_sata_platform_data *mv_platform_data; | 4021 | const struct mv_sata_platform_data *mv_platform_data; |
4023 | const struct ata_port_info *ppi[] = | 4022 | const struct ata_port_info *ppi[] = |
4024 | { &mv_port_info[chip_soc], NULL }; | 4023 | { &mv_port_info[chip_soc], NULL }; |
@@ -4027,8 +4026,7 @@ static int mv_platform_probe(struct platform_device *pdev) | |||
4027 | struct resource *res; | 4026 | struct resource *res; |
4028 | int n_ports, rc; | 4027 | int n_ports, rc; |
4029 | 4028 | ||
4030 | if (!printed_version++) | 4029 | ata_print_version_once(&pdev->dev, DRV_VERSION); |
4031 | dev_info(&pdev->dev, "version " DRV_VERSION "\n"); | ||
4032 | 4030 | ||
4033 | /* | 4031 | /* |
4034 | * Simple resource validation .. | 4032 | * Simple resource validation .. |
@@ -4285,15 +4283,13 @@ static void mv_print_info(struct ata_host *host) | |||
4285 | static int mv_pci_init_one(struct pci_dev *pdev, | 4283 | static int mv_pci_init_one(struct pci_dev *pdev, |
4286 | const struct pci_device_id *ent) | 4284 | const struct pci_device_id *ent) |
4287 | { | 4285 | { |
4288 | static int printed_version; | ||
4289 | unsigned int board_idx = (unsigned int)ent->driver_data; | 4286 | unsigned int board_idx = (unsigned int)ent->driver_data; |
4290 | const struct ata_port_info *ppi[] = { &mv_port_info[board_idx], NULL }; | 4287 | const struct ata_port_info *ppi[] = { &mv_port_info[board_idx], NULL }; |
4291 | struct ata_host *host; | 4288 | struct ata_host *host; |
4292 | struct mv_host_priv *hpriv; | 4289 | struct mv_host_priv *hpriv; |
4293 | int n_ports, port, rc; | 4290 | int n_ports, port, rc; |
4294 | 4291 | ||
4295 | if (!printed_version++) | 4292 | ata_print_version_once(&pdev->dev, DRV_VERSION); |
4296 | dev_info(&pdev->dev, "version " DRV_VERSION "\n"); | ||
4297 | 4293 | ||
4298 | /* allocate host */ | 4294 | /* allocate host */ |
4299 | n_ports = mv_get_hc_count(ppi[0]->flags) * MV_PORTS_PER_HC; | 4295 | n_ports = mv_get_hc_count(ppi[0]->flags) * MV_PORTS_PER_HC; |