atheros: various printk(...) fixes

[openwrt/openwrt.git] / target / linux / atheros / patches-3.10 / 120-spiflash.patch

diff --git a/target/linux/atheros/patches-3.10/120-spiflash.patch b/target/linux/atheros/patches-3.10/120-spiflash.patch
index 6be5705483f0b46bda4d64420a261c4071ba68db..7876de18fb5727a819561c02490ff68e6144a7dd 100644 (file)
--- a/target/linux/atheros/patches-3.10/120-spiflash.patch
+++ b/target/linux/atheros/patches-3.10/120-spiflash.patch
@@ -1,6 +1,6 @@
 --- a/drivers/mtd/devices/Kconfig
 +++ b/drivers/mtd/devices/Kconfig
-@@ -136,6 +136,10 @@ config MTD_BCM47XXSFLASH
+@@ -135,6 +135,10 @@ config MTD_BCM47XXSFLASH
          registered by bcma as platform devices. This enables driver for
          serial flash memories (only read-only mode is implemented).
  
@@ -251,7 +251,7 @@
 +              flash_size = FLASH_16MB;
 +              break;
 +      default:
-+              printk (KERN_WARNING SPIFLASH "Read of flash device signature failed!\n");
++              pr_warn(SPIFLASH "Read of flash device signature failed!\n");
 +              return 0;
 +      }
 +
@@ -454,19 +454,19 @@
 +
 +      priv->mmraddr = ioremap_nocache(SPI_FLASH_MMR, SPI_FLASH_MMR_SIZE);
 +      if (!priv->mmraddr) {
-+              printk(KERN_WARNING SPIFLASH "Failed to map flash device\n");
++              dev_warn(&pdev->dev, SPIFLASH "Failed to map flash device\n");
 +              goto error;
 +      }
 +
 +      index = spiflash_probe_chip(priv);
 +      if (!index) {
-+              printk (KERN_WARNING SPIFLASH "Found no serial flash device\n");
++              dev_warn(&pdev->dev, SPIFLASH "Found no flash device\n");
 +              goto error;
 +      }
 +
 +      priv->readaddr = ioremap_nocache(SPI_FLASH_READ, flashconfig_tbl[index].byte_cnt);
 +      if (!priv->readaddr) {
-+              printk (KERN_WARNING SPIFLASH "Failed to map flash device\n");
++              dev_warn(&pdev->dev, SPIFLASH "Failed to map flash device\n");
 +              goto error;
 +      }
 +