Commit 8115be01 authored by Russ Gorby's avatar Russ Gorby Committed by Greg Kroah-Hartman

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: default avatarRuss Gorby <russ.gorby@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2aff8d90
...@@ -1333,9 +1333,9 @@ static const struct spi_device_id ifx_id_table[] = { ...@@ -1333,9 +1333,9 @@ static const struct spi_device_id ifx_id_table[] = {
MODULE_DEVICE_TABLE(spi, ifx_id_table); MODULE_DEVICE_TABLE(spi, ifx_id_table);
/* spi operations */ /* spi operations */
static const struct spi_driver ifx_spi_driver_6160 = { static const struct spi_driver ifx_spi_driver = {
.driver = { .driver = {
.name = "ifx6160", .name = DRVNAME,
.bus = &spi_bus_type, .bus = &spi_bus_type,
.pm = &ifx_spi_pm, .pm = &ifx_spi_pm,
.owner = THIS_MODULE}, .owner = THIS_MODULE},
...@@ -1357,7 +1357,7 @@ static void __exit ifx_spi_exit(void) ...@@ -1357,7 +1357,7 @@ static void __exit ifx_spi_exit(void)
{ {
/* unregister */ /* unregister */
tty_unregister_driver(tty_drv); tty_unregister_driver(tty_drv);
spi_unregister_driver((void *)&ifx_spi_driver_6160); spi_unregister_driver((void *)&ifx_spi_driver);
} }
/** /**
...@@ -1399,7 +1399,7 @@ static int __init ifx_spi_init(void) ...@@ -1399,7 +1399,7 @@ static int __init ifx_spi_init(void)
return result; return result;
} }
result = spi_register_driver((void *)&ifx_spi_driver_6160); result = spi_register_driver((void *)&ifx_spi_driver);
if (result) { if (result) {
pr_err("%s: spi_register_driver failed(%d)", pr_err("%s: spi_register_driver failed(%d)",
DRVNAME, result); DRVNAME, result);
......
...@@ -29,8 +29,6 @@ ...@@ -29,8 +29,6 @@
#define DRVNAME "ifx6x60" #define DRVNAME "ifx6x60"
#define TTYNAME "ttyIFX" #define TTYNAME "ttyIFX"
/* #define IFX_THROTTLE_CODE */
#define IFX_SPI_MAX_MINORS 1 #define IFX_SPI_MAX_MINORS 1
#define IFX_SPI_TRANSFER_SIZE 2048 #define IFX_SPI_TRANSFER_SIZE 2048
#define IFX_SPI_FIFO_SIZE 4096 #define IFX_SPI_FIFO_SIZE 4096
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment