2011-06-30 13:36:35

by Wolfram Sang

Subject: [PATCH] leds: pca9532: change driver name to be unique

This driver handles the variants pca9530-pca9533, so it chose the name
"pca953x". However, there is a gpio driver which decided on the same
name. As a result, those two can't be loaded at the same time. Add a
subsystem prefix to make the driver name unique. Device matching will
not suffer, because both are I2C drivers which match using a
i2c_device_id-table which is not altered.

Signed-off-by: Wolfram Sang <[email protected]>
---
drivers/leds/leds-pca9532.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/leds/leds-pca9532.c b/drivers/leds/leds-pca9532.c
index d8d3a1e..a2c8746 100644
--- a/drivers/leds/leds-pca9532.c
+++ b/drivers/leds/leds-pca9532.c
@@ -88,7 +88,7 @@ static const struct pca9532_chip_info pca9532_chip_info_tbl[] = {

static struct i2c_driver pca9532_driver = {
.driver = {
- .name = "pca953x",
+ .name = "leds-pca953x",
},
.probe = pca9532_probe,
.remove = pca9532_remove,
--
1.7.5.4

2011-06-30 14:06:33

by Jean Delvare

Subject: Re: [PATCH] leds: pca9532: change driver name to be unique

On Thu, 30 Jun 2011 15:36:21 +0200, Wolfram Sang wrote:
> This driver handles the variants pca9530-pca9533, so it chose the name
> "pca953x". However, there is a gpio driver which decided on the same
> name. As a result, those two can't be loaded at the same time. Add a
> subsystem prefix to make the driver name unique. Device matching will
> not suffer, because both are I2C drivers which match using a
> i2c_device_id-table which is not altered.
>
> Signed-off-by: Wolfram Sang <[email protected]>

Which is (one of the reasons) why I hate "x" in driver names.

Acked-by: Jean Delvare <[email protected]>

> ---
> drivers/leds/leds-pca9532.c | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/leds/leds-pca9532.c b/drivers/leds/leds-pca9532.c
> index d8d3a1e..a2c8746 100644
> --- a/drivers/leds/leds-pca9532.c
> +++ b/drivers/leds/leds-pca9532.c
> @@ -88,7 +88,7 @@ static const struct pca9532_chip_info pca9532_chip_info_tbl[] = {
>
> static struct i2c_driver pca9532_driver = {
> .driver = {
> - .name = "pca953x",
> + .name = "leds-pca953x",
> },
> .probe = pca9532_probe,
> .remove = pca9532_remove,


--
Jean Delvare