3 files changed, 9 insertions, 9 deletions

diff --git a/drivers/net/ethernet/micrel/ks8842.c b/drivers/net/ethernet/micrel/ks8842.c
index 0686b93f1857..f84dd2dc82b6 100644
--- a/drivers/net/ethernet/micrel/ks8842.c
+++ b/drivers/net/ethernet/micrel/ks8842.c
@@ -458,7 +458,7 @@ static int ks8842_tx_frame_dma(struct sk_buff *skb, struct net_device *netdev)
         if (sg_dma_len(&ctl->sg) % 4)
                 sg_dma_len(&ctl->sg) += 4 - sg_dma_len(&ctl->sg) % 4;
 
-        ctl->adesc = ctl->chan->device->device_prep_slave_sg(ctl->chan,
+        ctl->adesc = dmaengine_prep_slave_sg(ctl->chan,
                 &ctl->sg, 1, DMA_MEM_TO_DEV,
                 DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_SRC_UNMAP);
         if (!ctl->adesc)
@@ -570,7 +570,7 @@ static int __ks8842_start_new_rx_dma(struct net_device *netdev)
 
                 sg_dma_len(sg) = DMA_BUFFER_SIZE;
 
-                ctl->adesc = ctl->chan->device->device_prep_slave_sg(ctl->chan,
+                ctl->adesc = dmaengine_prep_slave_sg(ctl->chan,
                         sg, 1, DMA_DEV_TO_MEM,
                         DMA_PREP_INTERRUPT | DMA_COMPL_SKIP_SRC_UNMAP);
 
diff --git a/drivers/net/ethernet/sfc/mtd.c b/drivers/net/ethernet/sfc/mtd.c
index 26b3c23b0b6f..758148379b0e 100644
--- a/drivers/net/ethernet/sfc/mtd.c
+++ b/drivers/net/ethernet/sfc/mtd.c
@@ -193,7 +193,7 @@ static int efx_mtd_erase(struct mtd_info *mtd, struct erase_info *erase)
                 erase->state = MTD_ERASE_DONE;
         } else {
                 erase->state = MTD_ERASE_FAILED;
-                erase->fail_addr = 0xffffffff;
+                erase->fail_addr = MTD_FAIL_ADDR_UNKNOWN;
         }
         mtd_erase_callback(erase);
         return rc;
@@ -263,10 +263,10 @@ static int efx_mtd_probe_device(struct efx_nic *efx, struct efx_mtd *efx_mtd)
                 part->mtd.owner = THIS_MODULE;
                 part->mtd.priv = efx_mtd;
                 part->mtd.name = part->name;
-                part->mtd.erase = efx_mtd_erase;
-                part->mtd.read = efx_mtd->ops->read;
-                part->mtd.write = efx_mtd->ops->write;
-                part->mtd.sync = efx_mtd_sync;
+                part->mtd._erase = efx_mtd_erase;
+                part->mtd._read = efx_mtd->ops->read;
+                part->mtd._write = efx_mtd->ops->write;
+                part->mtd._sync = efx_mtd_sync;
 
                 if (mtd_device_register(&part->mtd, NULL, 0))
                         goto fail;
diff --git a/drivers/net/wan/Kconfig b/drivers/net/wan/Kconfig
index 423eb26386c8..d70ede7a7f96 100644
--- a/drivers/net/wan/Kconfig
+++ b/drivers/net/wan/Kconfig
@@ -290,8 +290,8 @@ config FARSYNC
           Frame Relay or X.25/LAPB.
 
           If you want the module to be automatically loaded when the interface
-          is referenced then you should add "alias hdlcX farsync" to
-          /etc/modprobe.conf for each interface, where X is 0, 1, 2, ..., or
+          is referenced then you should add "alias hdlcX farsync" to a file
+          in /etc/modprobe.d/ for each interface, where X is 0, 1, 2, ..., or
           simply use "alias hdlc* farsync" to indicate all of them.
 
           To compile this driver as a module, choose M here: the