From c99b720f01966f99641680e26af7b7f08b6768cc Mon Sep 17 00:00:00 2001 From: Jingoo Han Date: Fri, 5 Apr 2013 10:54:05 +0900 Subject: [PATCH] --- yaml --- r: 364295 b: refs/heads/master c: 31bdfc649f4577c9b1120c67b7b1e85f7777aad0 h: refs/heads/master i: 364293: 784aeb11fb5d90ee6a3bae9424836a351d7ed09a 364291: d1fe54abfd3fa2742730334197f70822008f2b1f 364287: 034af96b57df450eb6a8acab04e9850878167a7f v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/max3100.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9da6a8a4a4b7..e54c52b75fa8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 89fa28dbe0395ee06f3aacfe27655323ebad43d1 +refs/heads/master: 31bdfc649f4577c9b1120c67b7b1e85f7777aad0 diff --git a/trunk/drivers/tty/serial/max3100.c b/trunk/drivers/tty/serial/max3100.c index 57da9bbaaab5..35866d5872ad 100644 --- a/trunk/drivers/tty/serial/max3100.c +++ b/trunk/drivers/tty/serial/max3100.c @@ -778,7 +778,7 @@ static int max3100_probe(struct spi_device *spi) max3100s[i]->spi = spi; max3100s[i]->irq = spi->irq; spin_lock_init(&max3100s[i]->conf_lock); - dev_set_drvdata(&spi->dev, max3100s[i]); + spi_set_drvdata(spi, max3100s[i]); pdata = spi->dev.platform_data; max3100s[i]->crystal = pdata->crystal; max3100s[i]->loopback = pdata->loopback; @@ -819,7 +819,7 @@ static int max3100_probe(struct spi_device *spi) static int max3100_remove(struct spi_device *spi) { - struct max3100_port *s = dev_get_drvdata(&spi->dev); + struct max3100_port *s = spi_get_drvdata(spi); int i; mutex_lock(&max3100s_lock);