diff options
author | Russ Gorby <russ.gorby@intel.com> | 2011-02-07 15:02:32 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-17 14:16:15 -0500 |
commit | 8115be01462f8af2dc22dd65dd28268bb9b8bff6 (patch) | |
tree | 13fe0aff0b735f8a87757a0f5bb8e1e084e882d5 /drivers | |
parent | 2aff8d90a073e5a07e1ff5a94779d6a21fb72dd2 (diff) |
serial: ifx6x60: minor cleanup
renamed spi_driver variable to not be h/w specific
set driver name to use DRVNAME define
removed commented-out define
Signed-off-by: Russ Gorby <russ.gorby@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/tty/serial/ifx6x60.c | 8 | ||||
-rw-r--r-- | drivers/tty/serial/ifx6x60.h | 2 |
2 files changed, 4 insertions, 6 deletions
diff --git a/drivers/tty/serial/ifx6x60.c b/drivers/tty/serial/ifx6x60.c index 59e9cb87b7de..b68b96f53e6c 100644 --- a/drivers/tty/serial/ifx6x60.c +++ b/drivers/tty/serial/ifx6x60.c | |||
@@ -1333,9 +1333,9 @@ static const struct spi_device_id ifx_id_table[] = { | |||
1333 | MODULE_DEVICE_TABLE(spi, ifx_id_table); | 1333 | MODULE_DEVICE_TABLE(spi, ifx_id_table); |
1334 | 1334 | ||
1335 | /* spi operations */ | 1335 | /* spi operations */ |
1336 | static const struct spi_driver ifx_spi_driver_6160 = { | 1336 | static const struct spi_driver ifx_spi_driver = { |
1337 | .driver = { | 1337 | .driver = { |
1338 | .name = "ifx6160", | 1338 | .name = DRVNAME, |
1339 | .bus = &spi_bus_type, | 1339 | .bus = &spi_bus_type, |
1340 | .pm = &ifx_spi_pm, | 1340 | .pm = &ifx_spi_pm, |
1341 | .owner = THIS_MODULE}, | 1341 | .owner = THIS_MODULE}, |
@@ -1357,7 +1357,7 @@ static void __exit ifx_spi_exit(void) | |||
1357 | { | 1357 | { |
1358 | /* unregister */ | 1358 | /* unregister */ |
1359 | tty_unregister_driver(tty_drv); | 1359 | tty_unregister_driver(tty_drv); |
1360 | spi_unregister_driver((void *)&ifx_spi_driver_6160); | 1360 | spi_unregister_driver((void *)&ifx_spi_driver); |
1361 | } | 1361 | } |
1362 | 1362 | ||
1363 | /** | 1363 | /** |
@@ -1399,7 +1399,7 @@ static int __init ifx_spi_init(void) | |||
1399 | return result; | 1399 | return result; |
1400 | } | 1400 | } |
1401 | 1401 | ||
1402 | result = spi_register_driver((void *)&ifx_spi_driver_6160); | 1402 | result = spi_register_driver((void *)&ifx_spi_driver); |
1403 | if (result) { | 1403 | if (result) { |
1404 | pr_err("%s: spi_register_driver failed(%d)", | 1404 | pr_err("%s: spi_register_driver failed(%d)", |
1405 | DRVNAME, result); | 1405 | DRVNAME, result); |
diff --git a/drivers/tty/serial/ifx6x60.h b/drivers/tty/serial/ifx6x60.h index 0ec39b58ccc4..e8464baf9e75 100644 --- a/drivers/tty/serial/ifx6x60.h +++ b/drivers/tty/serial/ifx6x60.h | |||
@@ -29,8 +29,6 @@ | |||
29 | #define DRVNAME "ifx6x60" | 29 | #define DRVNAME "ifx6x60" |
30 | #define TTYNAME "ttyIFX" | 30 | #define TTYNAME "ttyIFX" |
31 | 31 | ||
32 | /* #define IFX_THROTTLE_CODE */ | ||
33 | |||
34 | #define IFX_SPI_MAX_MINORS 1 | 32 | #define IFX_SPI_MAX_MINORS 1 |
35 | #define IFX_SPI_TRANSFER_SIZE 2048 | 33 | #define IFX_SPI_TRANSFER_SIZE 2048 |
36 | #define IFX_SPI_FIFO_SIZE 4096 | 34 | #define IFX_SPI_FIFO_SIZE 4096 |