Merge tag 'staging-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

Pull staging driver updates from Greg KH:
 "Here is the big set of Staging driver cleanups for 6.9-rc1. Nothing
  major in here, lots of small coding style cleanups for most drivers,
  and the removal of some obsolete hardare (the emxx_udc and some
  drivers/staging/board/ files).

  All of these have been in linux-next for a long time with no reported
  issues"

* tag 'staging-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (122 commits)
  staging: greybus: Replaces directive __attribute__((packed)) by __packed as suggested by checkpatch
  staging: greybus: Replace __attribute__((packed)) by __packed in various instances
  Staging: rtl8192e: Rename function GetHalfNmodeSupportByAPsHandler()
  Staging: rtl8192e: Rename function rtllib_FlushRxTsPendingPkts()
  Staging: rtl8192e: Rename goto OnADDBARsp_Reject
  Staging: rtl8192e: Rename goto OnADDBAReq_Fail
  Staging: rtl8192e: Rename function rtllib_send_ADDBARsp()
  Staging: rtl8192e: Rename function rtllib_send_ADDBAReq()
  Staging: rtl8192e: Rename variable TxRxSelect
  Staging: rtl8192e: Fix 5 chckpatch alignment warnings in rtl819x_BAProc.c
  Staging: rtl8192e: Rename function MgntQuery_MgntFrameTxRate
  Staging: rtl8192e: Rename boolean variable bHalfWirelessN24GMode
  Staging: rtl8192e: Rename reference AllowAllDestAddrHandler
  Staging: rtl8192e: Rename varoable asSta
  Staging: rtl8192e: Rename varoable osCcxVerNum
  Staging: rtl8192e: Rename variable CcxAironetBuf
  Staging: rtl8192e: Rename variable osCcxAironetIE
  Staging: rtl8192e: Rename variable AironetIeOui
  Staging: rtl8192e: Rename variable asRsn
  Staging: rtl8192e: Rename variable CcxVerNumBuf
  ...

diff --combined drivers/staging/fbtft/fbtft-core.c
index 68add4d598ae8655b5a6fa3e26d3d8342d408419,f1dd757b5c5c09ea4eaa3751906728cc2b90dab3..38845f23023fe705a168023b0b1ec122f9b6465f
--- 1/drivers/staging/fbtft/fbtft-core.c
--- 2/drivers/staging/fbtft/fbtft-core.c
+++ b/drivers/staging/fbtft/fbtft-core.c
@@@ -327,7 -327,6 +327,6 @@@ static void fbtft_deferred_io(struct fb
        unsigned int dirty_lines_start, dirty_lines_end;
        struct fb_deferred_io_pageref *pageref;
        unsigned int y_low = 0, y_high = 0;
-       int count = 0;
  
        spin_lock(&par->dirty_lock);
        dirty_lines_start = par->dirty_lines_start;
@@@ -339,7 -338,6 +338,6 @@@
  
        /* Mark display lines as dirty */
        list_for_each_entry(pageref, pagereflist, list) {
-               count++;
                y_low = pageref->offset / info->fix.line_length;
                y_high = (pageref->offset + PAGE_SIZE - 1) / info->fix.line_length;
                dev_dbg(info->device,
@@@ -794,7 -792,7 +792,7 @@@ int fbtft_register_framebuffer(struct f
        if (par->txbuf.buf && par->txbuf.len >= 1024)
                sprintf(text1, ", %zu KiB buffer memory", par->txbuf.len >> 10);
        if (spi)
 -              sprintf(text2, ", spi%d.%d at %d MHz", spi->master->bus_num,
 +              sprintf(text2, ", spi%d.%d at %d MHz", spi->controller->bus_num,
                        spi_get_chipselect(spi, 0), spi->max_speed_hz / 1000000);
        dev_info(fb_info->dev,
                 "%s frame buffer, %dx%d, %d KiB video memory%s, fps=%lu%s\n",
@@@ -1215,7 -1213,7 +1213,7 @@@ int fbtft_probe_common(struct fbtft_dis
  
        /* 9-bit SPI setup */
        if (par->spi && display->buswidth == 9) {
 -              if (par->spi->master->bits_per_word_mask & SPI_BPW_MASK(9)) {
 +              if (par->spi->controller->bits_per_word_mask & SPI_BPW_MASK(9)) {
                        par->spi->bits_per_word = 9;
                } else {
                        dev_warn(&par->spi->dev,

diff --combined drivers/staging/greybus/light.c
index d62f97249aca678886f064d4b8f7cf3304f6afa2,c6bd86a5335ab52d6331262c20a28b7f94b9e9d1..a5c2fe963866db66a487eaa824d53329ffc0c080
--- 1/drivers/staging/greybus/light.c
--- 2/drivers/staging/greybus/light.c
+++ b/drivers/staging/greybus/light.c
@@@ -29,9 -29,13 +29,9 @@@ struct gb_channel 
        struct attribute_group          *attr_group;
        const struct attribute_group    **attr_groups;
        struct led_classdev             *led;
 -#if IS_REACHABLE(CONFIG_LEDS_CLASS_FLASH)
        struct led_classdev_flash       fled;
        struct led_flash_setting        intensity_uA;
        struct led_flash_setting        timeout_us;
 -#else
 -      struct led_classdev             cled;
 -#endif
        struct gb_light                 *light;
        bool                            is_registered;
        bool                            releasing;
@@@ -80,6 -84,7 +80,6 @@@ static bool is_channel_flash(struct gb_
                                   | GB_CHANNEL_MODE_INDICATOR));
  }
  
 -#if IS_REACHABLE(CONFIG_LEDS_CLASS_FLASH)
  static struct gb_channel *get_channel_from_cdev(struct led_classdev *cdev)
  {
        struct led_classdev_flash *fled_cdev = lcdev_to_flcdev(cdev);
@@@ -95,15 -100,15 +95,15 @@@ static struct led_classdev *get_channel
  static struct gb_channel *get_channel_from_mode(struct gb_light *light,
                                                u32 mode)
  {
-       struct gb_channel *channel = NULL;
+       struct gb_channel *channel;
        int i;
  
        for (i = 0; i < light->channels_count; i++) {
                channel = &light->channels[i];
-               if (channel && channel->mode == mode)
-                       break;
+               if (channel->mode == mode)
+                       return channel;
        }
-       return channel;
+       return NULL;
  }
  
  static int __gb_lights_flash_intensity_set(struct gb_channel *channel,
@@@ -148,6 -153,22 +148,6 @@@ static int __gb_lights_flash_brightness
  
        return __gb_lights_flash_intensity_set(channel, intensity);
  }
 -#else
 -static struct gb_channel *get_channel_from_cdev(struct led_classdev *cdev)
 -{
 -      return container_of(cdev, struct gb_channel, cled);
 -}
 -
 -static struct led_classdev *get_channel_cdev(struct gb_channel *channel)
 -{
 -      return &channel->cled;
 -}
 -
 -static int __gb_lights_flash_brightness_set(struct gb_channel *channel)
 -{
 -      return 0;
 -}
 -#endif
  
  static int gb_lights_color_set(struct gb_channel *channel, u32 color);
  static int gb_lights_fade_set(struct gb_channel *channel);