6 files changed, 3 insertions, 37 deletions

diff --git a/apps/screen_access.c b/apps/screen_access.c
index 81bb6bae8f..7ebc45b8fd 100644
--- a/apps/screen_access.c
+++ b/apps/screen_access.c
@@ -251,7 +251,6 @@ struct screen screens[NB_SCREENS] =
         .puts_style_offset=&lcd_puts_style_offset,
         .puts_style_xyoffset=&lcd_puts_style_xyoffset,
         .puts_scroll_style=&lcd_puts_scroll_style,
-        .puts_scroll_style_offset=&lcd_puts_scroll_style_offset,
         .puts_scroll_style_xyoffset=&lcd_puts_scroll_style_xyoffset,
 #endif /* HAVE_LCD_BITMAP */
 
@@ -269,7 +268,6 @@ struct screen screens[NB_SCREENS] =
         .putsf=&lcd_putsf,
         .puts_offset=&lcd_puts_offset,
         .puts_scroll=&lcd_puts_scroll,
-        .puts_scroll_offset=&lcd_puts_scroll_offset,
         .putsxy_scroll_func=&lcd_putsxy_scroll_func,
         .scroll_speed=&lcd_scroll_speed,
         .scroll_delay=&lcd_scroll_delay,
@@ -357,7 +355,6 @@ struct screen screens[NB_SCREENS] =
         .puts_style_offset=&lcd_remote_puts_style_offset,
         .puts_style_xyoffset=&lcd_remote_puts_style_xyoffset,
         .puts_scroll_style=&lcd_remote_puts_scroll_style,
-        .puts_scroll_style_offset=&lcd_remote_puts_scroll_style_offset,
         .puts_scroll_style_xyoffset=&lcd_remote_puts_scroll_style_xyoffset,
 #endif /* 1 */
 
@@ -373,7 +370,6 @@ struct screen screens[NB_SCREENS] =
         .putsf=&lcd_remote_putsf,
         .puts_offset=&lcd_remote_puts_offset,
         .puts_scroll=&lcd_remote_puts_scroll,
-        .puts_scroll_offset=&lcd_remote_puts_scroll_offset,
         .putsxy_scroll_func=&lcd_remote_putsxy_scroll_func,
         .scroll_speed=&lcd_remote_scroll_speed,
         .scroll_delay=&lcd_remote_scroll_delay,
diff --git a/apps/screen_access.h b/apps/screen_access.h
index 7bc9c35237..c21d9cdb63 100644
--- a/apps/screen_access.h
+++ b/apps/screen_access.h
@@ -84,8 +84,6 @@ struct screen
                                 int style, int x_offset, int y_offset);
     void (*puts_scroll_style)(int x, int y, const unsigned char *string,
                                  int style);
-    void (*puts_scroll_style_offset)(int x, int y, const unsigned char *string,
-                                     int style, int x_offset);
     void (*puts_scroll_style_xyoffset)(int x, int y, const unsigned char *string,
                                      int style, int x_offset, int y_offset);
     void (*mono_bitmap)(const unsigned char *src,
@@ -143,8 +141,6 @@ struct screen
     void (*putsf)(int x, int y, const unsigned char *str, ...);
     void (*puts_offset)(int x, int y, const unsigned char *str, int offset);
     void (*puts_scroll)(int x, int y, const unsigned char *string);
-    void (*puts_scroll_offset)(int x, int y, const unsigned char *string,
-                                 int x_offset);
     void (*putsxy_scroll_func)(int x, int y, const unsigned char *string,
                                void (*scroll_func)(struct scrollinfo *),
                                void *data, int x_offset);
diff --git a/firmware/drivers/lcd-bitmap-common.c b/firmware/drivers/lcd-bitmap-common.c
index 2b309ba75a..00d317c9c8 100644
--- a/firmware/drivers/lcd-bitmap-common.c
+++ b/firmware/drivers/lcd-bitmap-common.c
@@ -624,19 +624,7 @@ void LCDFN(puts_scroll)(int x, int y, const unsigned char *string)
 void LCDFN(puts_scroll_style)(int x, int y, const unsigned char *string,
                               int style)
 {
-     LCDFN(puts_scroll_style_offset)(x, y, string, style, 0);
-}
-
-void LCDFN(puts_scroll_offset)(int x, int y, const unsigned char *string,
-                               int offset)
-{
-     LCDFN(puts_scroll_style_offset)(x, y, string, STYLE_DEFAULT, offset);
-}
-
-void LCDFN(puts_scroll_style_offset)(int x, int y, const unsigned char *string,
-                                     int style, int x_offset)
-{
-    LCDFN(puts_scroll_style_xyoffset)(x, y, string, style, x_offset, 0);
+     LCDFN(puts_scroll_style_xyoffset)(x, y, string, style, 0, 0);
 }
 
 #if !defined(HAVE_LCD_COLOR) || !defined(MAIN_LCD)
diff --git a/firmware/drivers/lcd-charcell.c b/firmware/drivers/lcd-charcell.c
index 54159519a3..c3b1482a3b 100644
--- a/firmware/drivers/lcd-charcell.c
+++ b/firmware/drivers/lcd-charcell.c
@@ -509,10 +509,6 @@ void lcd_puts_offset(int x, int y, const unsigned char *str, int offset)
 }
 
 /** scrolling **/
-void lcd_puts_scroll(int x, int y, const unsigned char *string)
-{
-    lcd_puts_scroll_offset(x, y, string, 0);
-}
 
 void lcd_puts_scroll_worker(int x, int y, const unsigned char *string,
                             int offset,
@@ -586,8 +582,7 @@ void lcd_scroll_fn(struct scrollinfo* s)
     }
 }
 
-void lcd_puts_scroll_offset(int x, int y, const unsigned char *string,
-                            int offset)
+void lcd_puts_scroll(int x, int y, const unsigned char *string)
 {
-    lcd_puts_scroll_worker(x, y, string, offset, lcd_scroll_fn, NULL);
+    lcd_puts_scroll_worker(x, y, string, 0, lcd_scroll_fn, NULL);
 }
diff --git a/firmware/export/lcd-remote.h b/firmware/export/lcd-remote.h
index f209e6b47d..5eb08b618f 100644
--- a/firmware/export/lcd-remote.h
+++ b/firmware/export/lcd-remote.h
@@ -187,11 +187,6 @@ extern void lcd_remote_putc(int x, int y, unsigned short ch);
 extern void lcd_remote_puts_scroll(int x, int y, const unsigned char *str);
 extern void lcd_remote_puts_scroll_style(int x, int y, const unsigned char *str,
                                          int style);
-extern void lcd_remote_puts_scroll_offset(int x, int y,
-                                          const unsigned char *str, int offset);
-extern void lcd_remote_puts_scroll_style_offset(int x, int y,
-                                                const unsigned char *string,
-                                                int style, int offset);
 extern void lcd_remote_puts_scroll_style_xyoffset(int x, int y,
                                                   const unsigned char *string,
                                                   int style, int x_offset,
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index af32b796be..dd7c3ba80f 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -208,8 +208,6 @@ extern void lcd_puts(int x, int y, const unsigned char *string);
 extern void lcd_putsf(int x, int y, const unsigned char *fmt, ...);
 extern void lcd_puts_style(int x, int y, const unsigned char *string, int style);
 extern void lcd_puts_offset(int x, int y, const unsigned char *str, int offset);
-extern void lcd_puts_scroll_offset(int x, int y, const unsigned char *string,
-                                  int offset);
 extern void lcd_putc(int x, int y, unsigned long ucs);
 extern void lcd_puts_scroll(int x, int y, const unsigned char* string);
 extern void lcd_puts_scroll_style(int x, int y, const unsigned char* string,
@@ -506,8 +504,6 @@ extern void lcd_puts_style_offset(int x, int y, const unsigned char *str,
                                   int style, int x_offset);
 extern void lcd_puts_style_xyoffset(int x, int y, const unsigned char *str,
                                   int style, int x_offset, int y_offset);
-extern void lcd_puts_scroll_style_offset(int x, int y, const unsigned char *string,
-                                  int style, int x_offset);
 extern void lcd_puts_scroll_style_xyoffset(int x, int y, const unsigned char *string,
                                   int style, int x_offset, int y_offset);