lkml.org 
[lkml]   [2009]   [Mar]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH 2/8] staging: agnx, probe cleanup
Date
- switch printks to dev_*
- remove useless comments
- remove useless prints (for info we can obtain from lspci or /sys)

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
---
drivers/staging/agnx/pci.c | 34 ++++++++++++----------------------
1 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/drivers/staging/agnx/pci.c b/drivers/staging/agnx/pci.c
index 4ff4c16..f646211 100644
--- a/drivers/staging/agnx/pci.c
+++ b/drivers/staging/agnx/pci.c
@@ -452,47 +452,39 @@ static int __devinit agnx_pci_probe(struct pci_dev *pdev,
{
struct ieee80211_hw *dev;
struct agnx_priv *priv;
- u32 mem_addr0, mem_len0;
- u32 mem_addr1, mem_len1;
+ u32 mem_len0, mem_len1;
int err;
DECLARE_MAC_BUF(mac);

err = pci_enable_device(pdev);
if (err) {
- printk(KERN_ERR PFX "Can't enable new PCI device\n");
+ dev_err(&pdev->dev, "can't enable PCI device\n");
return err;
}

- /* get pci resource */
- mem_addr0 = pci_resource_start(pdev, 0);
mem_len0 = pci_resource_len(pdev, 0);
- mem_addr1 = pci_resource_start(pdev, 1);
mem_len1 = pci_resource_len(pdev, 1);
- printk(KERN_DEBUG PFX "Memaddr0 is %x, length is %x\n", mem_addr0, mem_len0);
- printk(KERN_DEBUG PFX "Memaddr1 is %x, length is %x\n", mem_addr1, mem_len1);

err = pci_request_regions(pdev, "agnx-pci");
if (err) {
- printk(KERN_ERR PFX "Can't obtain PCI resource\n");
+ dev_err(&pdev->dev, "can't reserve PCI resources\n");
return err;
}

if (pci_set_dma_mask(pdev, DMA_32BIT_MASK) ||
pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK)) {
- printk(KERN_ERR PFX "No suitable DMA available\n");
+ dev_err(&pdev->dev, "no suitable DMA available\n");
goto err_free_reg;
}

pci_set_master(pdev);
- printk(KERN_DEBUG PFX "pdev->irq is %d\n", pdev->irq);

dev = ieee80211_alloc_hw(sizeof(*priv), &agnx_ops);
if (!dev) {
- printk(KERN_ERR PFX "ieee80211 alloc failed\n");
+ dev_err(&pdev->dev, "ieee80211 alloc failed\n");
err = -ENOMEM;
goto err_free_reg;
}
- /* init priv */
priv = dev->priv;
memset(priv, 0, sizeof(*priv));
priv->mode = NL80211_IFTYPE_MONITOR;
@@ -501,17 +493,15 @@ static int __devinit agnx_pci_probe(struct pci_dev *pdev,
spin_lock_init(&priv->lock);
priv->init_status = AGNX_UNINIT;

- /* Map mem #1 and #2 */
priv->ctl = pci_iomap(pdev, 0, mem_len0);
-/* printk(KERN_DEBUG PFX"MEM1 mapped address is 0x%p\n", priv->ctl); */
+/* dev_dbg(&pdev->dev, "MEM1 mapped address is 0x%p\n", priv->ctl); */
if (!priv->ctl) {
- printk(KERN_ERR PFX "Can't map device memory\n");
+ dev_err(&pdev->dev, "can't map device memory\n");
goto err_free_dev;
}
priv->data = pci_iomap(pdev, 1, mem_len1);
- printk(KERN_DEBUG PFX "MEM2 mapped address is 0x%p\n", priv->data);
if (!priv->data) {
- printk(KERN_ERR PFX "Can't map device memory\n");
+ dev_err(&pdev->dev, "can't map device memory\n");
goto err_iounmap2;
}

@@ -552,15 +542,15 @@ static int __devinit agnx_pci_probe(struct pci_dev *pdev,

err = ieee80211_register_hw(dev);
if (err) {
- printk(KERN_ERR PFX "Can't register hardware\n");
+ dev_err(&pdev->dev, "can't register hardware\n");
goto err_iounmap;
}

agnx_hw_reset(priv);

-
- printk(PFX "%s: hwaddr %s, Rev 0x%02x\n", wiphy_name(dev->wiphy),
- print_mac(mac, dev->wiphy->perm_addr), priv->revid);
+ dev_info(&pdev->dev, "%s: hwaddr %s, Rev 0x%02x\n",
+ wiphy_name(dev->wiphy),
+ print_mac(mac, dev->wiphy->perm_addr), priv->revid);
return 0;

err_iounmap:
--
1.6.2


\
 
 \ /
  Last update: 2009-03-26 09:39    [W:0.056 / U:13.324 seconds]
©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site