aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNoralf Trønnes <noralf@tronnes.org>2017-09-08 11:07:26 -0400
committerNoralf Trønnes <noralf@tronnes.org>2017-09-16 08:07:59 -0400
commit95a0cfe98ca07bb17dcdc285097a742a975456eb (patch)
treef85bb24739d28d5a0101a5cb9906ec5a422126f8
parenta5ea8a6803fdec949f752d3aa36b1a88e453b929 (diff)
drm/tinydrm: Drop driver registered message
No need to put out a driver registered message since drm_dev_register() does that now. SPI speed is an important metric when dealing with display problems, so retain that info. Cc: David Lechner <david@lechnology.com> Signed-off-by: Noralf Trønnes <noralf@tronnes.org> Acked-by: David Lechner <david@lechnology.com> Link: https://patchwork.freedesktop.org/patch/msgid/1504883250-43487-8-git-send-email-noralf@tronnes.org
-rw-r--r--drivers/gpu/drm/tinydrm/mi0283qt.c14
-rw-r--r--drivers/gpu/drm/tinydrm/mipi-dbi.c2
-rw-r--r--drivers/gpu/drm/tinydrm/repaper.c12
-rw-r--r--drivers/gpu/drm/tinydrm/st7586.c14
4 files changed, 6 insertions, 36 deletions
diff --git a/drivers/gpu/drm/tinydrm/mi0283qt.c b/drivers/gpu/drm/tinydrm/mi0283qt.c
index 7e5bb7d6f655..7fd26912f2ba 100644
--- a/drivers/gpu/drm/tinydrm/mi0283qt.c
+++ b/drivers/gpu/drm/tinydrm/mi0283qt.c
@@ -163,7 +163,6 @@ MODULE_DEVICE_TABLE(spi, mi0283qt_id);
163static int mi0283qt_probe(struct spi_device *spi) 163static int mi0283qt_probe(struct spi_device *spi)
164{ 164{
165 struct device *dev = &spi->dev; 165 struct device *dev = &spi->dev;
166 struct tinydrm_device *tdev;
167 struct mipi_dbi *mipi; 166 struct mipi_dbi *mipi;
168 struct gpio_desc *dc; 167 struct gpio_desc *dc;
169 u32 rotation = 0; 168 u32 rotation = 0;
@@ -215,20 +214,9 @@ static int mi0283qt_probe(struct spi_device *spi)
215 return ret; 214 return ret;
216 } 215 }
217 216
218 tdev = &mipi->tinydrm;
219
220 ret = devm_tinydrm_register(tdev);
221 if (ret)
222 return ret;
223
224 spi_set_drvdata(spi, mipi); 217 spi_set_drvdata(spi, mipi);
225 218
226 DRM_DEBUG_DRIVER("Initialized %s:%s @%uMHz on minor %d\n", 219 return devm_tinydrm_register(&mipi->tinydrm);
227 tdev->drm->driver->name, dev_name(dev),
228 spi->max_speed_hz / 1000000,
229 tdev->drm->primary->index);
230
231 return 0;
232} 220}
233 221
234static void mi0283qt_shutdown(struct spi_device *spi) 222static void mi0283qt_shutdown(struct spi_device *spi)
diff --git a/drivers/gpu/drm/tinydrm/mipi-dbi.c b/drivers/gpu/drm/tinydrm/mipi-dbi.c
index 2caeabcd3458..f0dedc244944 100644
--- a/drivers/gpu/drm/tinydrm/mipi-dbi.c
+++ b/drivers/gpu/drm/tinydrm/mipi-dbi.c
@@ -842,6 +842,8 @@ int mipi_dbi_spi_init(struct spi_device *spi, struct mipi_dbi *mipi,
842 return -ENOMEM; 842 return -ENOMEM;
843 } 843 }
844 844
845 DRM_DEBUG_DRIVER("SPI speed: %uMHz\n", spi->max_speed_hz / 1000000);
846
845 return 0; 847 return 0;
846} 848}
847EXPORT_SYMBOL(mipi_dbi_spi_init); 849EXPORT_SYMBOL(mipi_dbi_spi_init);
diff --git a/drivers/gpu/drm/tinydrm/repaper.c b/drivers/gpu/drm/tinydrm/repaper.c
index 30dc97b3ff21..5fbe14715c83 100644
--- a/drivers/gpu/drm/tinydrm/repaper.c
+++ b/drivers/gpu/drm/tinydrm/repaper.c
@@ -1078,19 +1078,11 @@ static int repaper_probe(struct spi_device *spi)
1078 return ret; 1078 return ret;
1079 1079
1080 drm_mode_config_reset(tdev->drm); 1080 drm_mode_config_reset(tdev->drm);
1081
1082 ret = devm_tinydrm_register(tdev);
1083 if (ret)
1084 return ret;
1085
1086 spi_set_drvdata(spi, tdev); 1081 spi_set_drvdata(spi, tdev);
1087 1082
1088 DRM_DEBUG_DRIVER("Initialized %s:%s @%uMHz on minor %d\n", 1083 DRM_DEBUG_DRIVER("SPI speed: %uMHz\n", spi->max_speed_hz / 1000000);
1089 tdev->drm->driver->name, dev_name(dev),
1090 spi->max_speed_hz / 1000000,
1091 tdev->drm->primary->index);
1092 1084
1093 return 0; 1085 return devm_tinydrm_register(tdev);
1094} 1086}
1095 1087
1096static void repaper_shutdown(struct spi_device *spi) 1088static void repaper_shutdown(struct spi_device *spi)
diff --git a/drivers/gpu/drm/tinydrm/st7586.c b/drivers/gpu/drm/tinydrm/st7586.c
index b439956a07f4..07b4d312784c 100644
--- a/drivers/gpu/drm/tinydrm/st7586.c
+++ b/drivers/gpu/drm/tinydrm/st7586.c
@@ -343,7 +343,6 @@ MODULE_DEVICE_TABLE(spi, st7586_id);
343static int st7586_probe(struct spi_device *spi) 343static int st7586_probe(struct spi_device *spi)
344{ 344{
345 struct device *dev = &spi->dev; 345 struct device *dev = &spi->dev;
346 struct tinydrm_device *tdev;
347 struct mipi_dbi *mipi; 346 struct mipi_dbi *mipi;
348 struct gpio_desc *a0; 347 struct gpio_desc *a0;
349 u32 rotation = 0; 348 u32 rotation = 0;
@@ -388,20 +387,9 @@ static int st7586_probe(struct spi_device *spi)
388 if (ret) 387 if (ret)
389 return ret; 388 return ret;
390 389
391 tdev = &mipi->tinydrm;
392
393 ret = devm_tinydrm_register(tdev);
394 if (ret)
395 return ret;
396
397 spi_set_drvdata(spi, mipi); 390 spi_set_drvdata(spi, mipi);
398 391
399 DRM_DEBUG_DRIVER("Initialized %s:%s @%uMHz on minor %d\n", 392 return devm_tinydrm_register(&mipi->tinydrm);
400 tdev->drm->driver->name, dev_name(dev),
401 spi->max_speed_hz / 1000000,
402 tdev->drm->primary->index);
403
404 return 0;
405} 393}
406 394
407static void st7586_shutdown(struct spi_device *spi) 395static void st7586_shutdown(struct spi_device *spi)