1 files changed, 4 insertions, 8 deletions

diff --git a/arch/powerpc/sysdev/cpm1.c b/arch/powerpc/sysdev/cpm1.c
index 8d103ca6d6a..d5cf7d4ccf8 100644
--- a/arch/powerpc/sysdev/cpm1.c
+++ b/arch/powerpc/sysdev/cpm1.c
@@ -621,7 +621,6 @@ int cpm1_gpiochip_add16(struct device_node *np)
 {
         struct cpm1_gpio16_chip *cpm1_gc;
         struct of_mm_gpio_chip *mm_gc;
-        struct of_gpio_chip *of_gc;
         struct gpio_chip *gc;
 
         cpm1_gc = kzalloc(sizeof(*cpm1_gc), GFP_KERNEL);
@@ -631,11 +630,10 @@ int cpm1_gpiochip_add16(struct device_node *np)
         spin_lock_init(&cpm1_gc->lock);
 
         mm_gc = &cpm1_gc->mm_gc;
-        of_gc = &mm_gc->of_gc;
-        gc = &of_gc->gc;
+        gc = &mm_gc->gc;
 
         mm_gc->save_regs = cpm1_gpio16_save_regs;
-        of_gc->gpio_cells = 2;
+        gc->of_gpio_n_cells = 2;
         gc->ngpio = 16;
         gc->direction_input = cpm1_gpio16_dir_in;
         gc->direction_output = cpm1_gpio16_dir_out;
@@ -745,7 +743,6 @@ int cpm1_gpiochip_add32(struct device_node *np)
 {
         struct cpm1_gpio32_chip *cpm1_gc;
         struct of_mm_gpio_chip *mm_gc;
-        struct of_gpio_chip *of_gc;
         struct gpio_chip *gc;
 
         cpm1_gc = kzalloc(sizeof(*cpm1_gc), GFP_KERNEL);
@@ -755,11 +752,10 @@ int cpm1_gpiochip_add32(struct device_node *np)
         spin_lock_init(&cpm1_gc->lock);
 
         mm_gc = &cpm1_gc->mm_gc;
-        of_gc = &mm_gc->of_gc;
-        gc = &of_gc->gc;
+        gc = &mm_gc->gc;
 
         mm_gc->save_regs = cpm1_gpio32_save_regs;
-        of_gc->gpio_cells = 2;
+        gc->of_gpio_n_cells = 2;
         gc->ngpio = 32;
         gc->direction_input = cpm1_gpio32_dir_in;
         gc->direction_output = cpm1_gpio32_dir_out;