2 files changed, 9 insertions, 11 deletions

diff --git a/drivers/dca/dca-sysfs.c b/drivers/dca/dca-sysfs.c
index 24a263b6844c..011328faa5f2 100644
--- a/drivers/dca/dca-sysfs.c
+++ b/drivers/dca/dca-sysfs.c
@@ -12,10 +12,10 @@ static spinlock_t dca_idr_lock;
 
 int dca_sysfs_add_req(struct dca_provider *dca, struct device *dev, int slot)
 {
-        struct class_device *cd;
+        struct device *cd;
 
-        cd = class_device_create(dca_class, dca->cd, MKDEV(0, slot + 1),
-                                 dev, "requester%d", slot);
+        cd = device_create(dca_class, dca->cd, MKDEV(0, slot + 1),
+                           "requester%d", slot);
         if (IS_ERR(cd))
                 return PTR_ERR(cd);
         return 0;
@@ -23,12 +23,12 @@ int dca_sysfs_add_req(struct dca_provider *dca, struct device *dev, int slot)
 
 void dca_sysfs_remove_req(struct dca_provider *dca, int slot)
 {
-        class_device_destroy(dca_class, MKDEV(0, slot + 1));
+        device_destroy(dca_class, MKDEV(0, slot + 1));
 }
 
 int dca_sysfs_add_provider(struct dca_provider *dca, struct device *dev)
 {
-        struct class_device *cd;
+        struct device *cd;
         int err = 0;
 
 idr_try_again:
@@ -46,8 +46,7 @@ idr_try_again:
                 return err;
         }
 
-        cd = class_device_create(dca_class, NULL, MKDEV(0, 0),
-                                 dev, "dca%d", dca->id);
+        cd = device_create(dca_class, dev, MKDEV(0, 0), "dca%d", dca->id);
         if (IS_ERR(cd)) {
                 spin_lock(&dca_idr_lock);
                 idr_remove(&dca_idr, dca->id);
@@ -60,7 +59,7 @@ idr_try_again:
 
 void dca_sysfs_remove_provider(struct dca_provider *dca)
 {
-        class_device_unregister(dca->cd);
+        device_unregister(dca->cd);
         dca->cd = NULL;
         spin_lock(&dca_idr_lock);
         idr_remove(&dca_idr, dca->id);
diff --git a/drivers/net/wan/x25_asy.c b/drivers/net/wan/x25_asy.c
index 1e89d4de1bb7..5e2d763c6b5f 100644
--- a/drivers/net/wan/x25_asy.c
+++ b/drivers/net/wan/x25_asy.c
@@ -554,6 +554,7 @@ static void x25_asy_receive_buf(struct tty_struct *tty, const unsigned char *cp,
 static int x25_asy_open_tty(struct tty_struct *tty)
 {
         struct x25_asy *sl = (struct x25_asy *) tty->disc_data;
+        struct tty_ldisc *ld;
         int err;
 
         /* First make sure we're not already connected. */
@@ -572,9 +573,7 @@ static int x25_asy_open_tty(struct tty_struct *tty)
         if (tty->driver->flush_buffer)  {
                 tty->driver->flush_buffer(tty);
         }
-        if (tty->ldisc.flush_buffer)  {
-                tty->ldisc.flush_buffer(tty);
-        }
+        tty_ldisc_flush(tty);
 
         /* Restore default settings */
         sl->dev->type = ARPHRD_X25;