Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

backlight: simplify corgi_bl locking

Now update_status has locking, we can remove the mutex from corgi_bl.

Signed-off-by: Richard Purdie <rpurdie@rpsys.net>

+5 -8
+5 -8
drivers/video/backlight/corgi_bl.c
··· 22 22 #include <asm/hardware/sharpsl_pm.h> 23 23 24 24 static int corgibl_intensity; 25 - static DEFINE_MUTEX(bl_mutex); 26 25 static struct backlight_properties corgibl_data; 27 26 static struct backlight_device *corgi_backlight_device; 28 27 static struct corgibl_machinfo *bl_machinfo; ··· 44 45 if (corgibl_flags & CORGIBL_BATTLOW) 45 46 intensity &= bl_machinfo->limit_mask; 46 47 47 - mutex_lock(&bl_mutex); 48 48 bl_machinfo->set_bl_intensity(intensity); 49 - mutex_unlock(&bl_mutex); 50 49 51 50 corgibl_intensity = intensity; 52 51 ··· 63 66 struct backlight_device *bd = platform_get_drvdata(pdev); 64 67 65 68 corgibl_flags |= CORGIBL_SUSPENDED; 66 - corgibl_send_intensity(bd); 69 + backlight_update_status(bd); 67 70 return 0; 68 71 } 69 72 ··· 72 75 struct backlight_device *bd = platform_get_drvdata(pdev); 73 76 74 77 corgibl_flags &= ~CORGIBL_SUSPENDED; 75 - corgibl_send_intensity(bd); 78 + backlight_update_status(bd); 76 79 return 0; 77 80 } 78 81 #else ··· 95 98 corgibl_flags |= CORGIBL_BATTLOW; 96 99 else 97 100 corgibl_flags &= ~CORGIBL_BATTLOW; 98 - corgibl_send_intensity(corgi_backlight_device); 101 + backlight_update_status(corgi_backlight_device); 99 102 } 100 103 EXPORT_SYMBOL(corgibl_limit_intensity); 101 104 ··· 123 126 corgi_backlight_device->props.max_brightness = machinfo->max_intensity; 124 127 corgi_backlight_device->props.power = FB_BLANK_UNBLANK; 125 128 corgi_backlight_device->props.brightness = machinfo->default_intensity; 126 - corgibl_send_intensity(corgi_backlight_device); 129 + backlight_update_status(corgi_backlight_device); 127 130 128 131 printk("Corgi Backlight Driver Initialized.\n"); 129 132 return 0; ··· 135 138 136 139 corgibl_data.power = 0; 137 140 corgibl_data.brightness = 0; 138 - corgibl_send_intensity(bd); 141 + backlight_update_status(bd); 139 142 140 143 backlight_device_unregister(bd); 141 144