diff options
Diffstat (limited to 'drivers/iio')
| -rw-r--r-- | drivers/iio/magnetometer/ak8975.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/iio/magnetometer/ak8975.c b/drivers/iio/magnetometer/ak8975.c index a2357921d761..bf5ef077e791 100644 --- a/drivers/iio/magnetometer/ak8975.c +++ b/drivers/iio/magnetometer/ak8975.c | |||
| @@ -477,8 +477,8 @@ static const struct acpi_device_id ak_acpi_match[] = { | |||
| 477 | }; | 477 | }; |
| 478 | MODULE_DEVICE_TABLE(acpi, ak_acpi_match); | 478 | MODULE_DEVICE_TABLE(acpi, ak_acpi_match); |
| 479 | 479 | ||
| 480 | static char *ak8975_match_acpi_device(struct device *dev, | 480 | static const char *ak8975_match_acpi_device(struct device *dev, |
| 481 | enum asahi_compass_chipset *chipset) | 481 | enum asahi_compass_chipset *chipset) |
| 482 | { | 482 | { |
| 483 | const struct acpi_device_id *id; | 483 | const struct acpi_device_id *id; |
| 484 | 484 | ||
| @@ -487,7 +487,7 @@ static char *ak8975_match_acpi_device(struct device *dev, | |||
| 487 | return NULL; | 487 | return NULL; |
| 488 | *chipset = (int)id->driver_data; | 488 | *chipset = (int)id->driver_data; |
| 489 | 489 | ||
| 490 | return (char *)dev_name(dev); | 490 | return dev_name(dev); |
| 491 | } | 491 | } |
| 492 | 492 | ||
| 493 | static int ak8975_probe(struct i2c_client *client, | 493 | static int ak8975_probe(struct i2c_client *client, |
| @@ -497,7 +497,7 @@ static int ak8975_probe(struct i2c_client *client, | |||
| 497 | struct iio_dev *indio_dev; | 497 | struct iio_dev *indio_dev; |
| 498 | int eoc_gpio; | 498 | int eoc_gpio; |
| 499 | int err; | 499 | int err; |
| 500 | char *name = NULL; | 500 | const char *name = NULL; |
| 501 | 501 | ||
| 502 | /* Grab and set up the supplied GPIO. */ | 502 | /* Grab and set up the supplied GPIO. */ |
| 503 | if (client->dev.platform_data) | 503 | if (client->dev.platform_data) |
| @@ -539,7 +539,7 @@ static int ak8975_probe(struct i2c_client *client, | |||
| 539 | if (id) { | 539 | if (id) { |
| 540 | data->chipset = | 540 | data->chipset = |
| 541 | (enum asahi_compass_chipset)(id->driver_data); | 541 | (enum asahi_compass_chipset)(id->driver_data); |
| 542 | name = (char *) id->name; | 542 | name = id->name; |
| 543 | } else if (ACPI_HANDLE(&client->dev)) | 543 | } else if (ACPI_HANDLE(&client->dev)) |
| 544 | name = ak8975_match_acpi_device(&client->dev, &data->chipset); | 544 | name = ak8975_match_acpi_device(&client->dev, &data->chipset); |
| 545 | else | 545 | else |