Merge tag 'auxdisplay-v6.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/andy...

Pull auxdisplay update from Andy Shevchenko:

 - Move Holtek 16k33 driver to use agnostic i2c_get_match_data()

 - Miscellaneuous cleanups

* tag 'auxdisplay-v6.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay:
  auxdisplay: Remove unused functions
  auxdisplay: ht16k33: Make use of i2c_get_match_data()
  auxdisplay: Drop explicit initialization of struct i2c_device_id::driver_data to 0

diff --combined drivers/auxdisplay/ht16k33.c
index a816f9e102559574c5d492501be51129faf18bce,96ad9e972bd737f6090e80295288b11e0fbffe97..09deb864b27ae4a44c46e20bcf81ac82a9f61986
--- 1/drivers/auxdisplay/ht16k33.c
--- 2/drivers/auxdisplay/ht16k33.c
+++ b/drivers/auxdisplay/ht16k33.c
@@@ -25,7 -25,7 +25,7 @@@
  #include <linux/map_to_7segment.h>
  #include <linux/map_to_14segment.h>
  
 -#include <asm/unaligned.h>
 +#include <linux/unaligned.h>
  
  #include "line-display.h"
  
@@@ -657,7 -657,6 +657,6 @@@ static int ht16k33_seg_probe(struct dev
  static int ht16k33_probe(struct i2c_client *client)
  {
        struct device *dev = &client->dev;
-       const struct of_device_id *id;
        struct ht16k33_priv *priv;
        uint32_t dft_brightness;
        int err;
@@@ -672,9 -671,8 +671,8 @@@
                return -ENOMEM;
  
        priv->client = client;
-       id = i2c_of_match_device(dev->driver->of_match_table, client);
-       if (id)
-               priv->type = (uintptr_t)id->data;
+       priv->type = (uintptr_t)i2c_get_match_data(client);
+ 
        i2c_set_clientdata(client, priv);
  
        err = ht16k33_initialize(priv);
@@@ -747,7 -745,9 +745,9 @@@ static void ht16k33_remove(struct i2c_c
  }
  
  static const struct i2c_device_id ht16k33_i2c_match[] = {
-       { "ht16k33", 0 },
+       { "3108", DISP_QUAD_7SEG },
+       { "3130", DISP_QUAD_14SEG },
+       { "ht16k33", DISP_MATRIX },
        { }
  };
  MODULE_DEVICE_TABLE(i2c, ht16k33_i2c_match);