Re: therm_pm72 units, interface

["Michel Dänzer" <michel@daenzer.net>]

On Sam, 2013-08-03 at 07:02 +1000, Benjamin Herrenschmidt wrote:
> On Fri, 2013-08-02 at 18:52 +0200, Michel D=C3=A4nzer wrote:
>=20
> > Thanks for the suggestion. The same windfarm modules were loaded in bot=
h
> > cases, but i2c_powermac wasn't loaded with the newer kernels. Loading i=
t
> > manually fixes the problem.
> >=20
> > How is i2c_powermac supposed to get loaded with current kernels?
>=20
> It's a platform driver, but it's missing a module device-table
>=20
> Can you try this completely untested patch ?
>=20
> diff --git a/drivers/i2c/busses/i2c-powermac.c b/drivers/i2c/busses/i2c-p=
owermac.c
> index 8dc90da..5af5153 100644
> --- a/drivers/i2c/busses/i2c-powermac.c
> +++ b/drivers/i2c/busses/i2c-powermac.c
> @@ -458,9 +458,15 @@ static int i2c_powermac_probe(struct platform_device=
 *dev)
>  	return rc;
>  }
> =20
> +static const struct platform_device_id i2c_powermac_id =3D {
> +	.name =3D "i2c-powermac"
> +};
> +MODULE_DEVICE_TABLE(platform, i2c_powermac_id);
> +
>  static struct platform_driver i2c_powermac_driver =3D {
>  	.probe =3D i2c_powermac_probe,
>  	.remove =3D i2c_powermac_remove,
> +	.id_table =3D *i2c_powermac_id,

This fails to build:

  CC [M]  drivers/i2c/busses/i2c-powermac.o
drivers/i2c/busses/i2c-powermac.c:469:14: error: invalid type argument of u=
nary =E2=80=98*=E2=80=99 (have =E2=80=98const struct platform_device_id=E2=
=80=99)
make[1]: *** [drivers/i2c/busses/i2c-powermac.o] Error 1

The version below builds, but the module still doesn't get loaded
automagically (unless I'm missing some command I need to run between
copying the new module to /lib/modules/$(uname -r)/ and rebooting?).

Looking at other drivers in drivers/i2c/busses/, maybe
i2c_powermac_driver.driver needs an of_match_table entry?


diff --git a/drivers/i2c/busses/i2c-powermac.c
b/drivers/i2c/busses/i2c-powermac.c
index 8dc90da..74066fc 100644
--- a/drivers/i2c/busses/i2c-powermac.c
+++ b/drivers/i2c/busses/i2c-powermac.c
@@ -458,9 +458,19 @@ static int i2c_powermac_probe(struct
platform_device *dev)
        return rc;
 }

+static const struct platform_device_id i2c_powermac_id[] =3D {
+       {
+               .name =3D "i2c-powermac"
+       }, {
+               /* sentinel */
+       }
+};
+MODULE_DEVICE_TABLE(platform, i2c_powermac_id);
+
 static struct platform_driver i2c_powermac_driver =3D {
        .probe =3D i2c_powermac_probe,
        .remove =3D i2c_powermac_remove,
+       .id_table =3D i2c_powermac_id,
        .driver =3D {
                .name =3D "i2c-powermac",
                .bus =3D &platform_bus_type,
@@ -468,5 +478,3 @@ static struct platform_driver i2c_powermac_driver =3D
{
 };

 module_platform_driver(i2c_powermac_driver);
-
-MODULE_ALIAS("platform:i2c-powermac");

--=20
Earthling Michel D=C3=A4nzer           |                   http://www.amd.c=
om
Libre software enthusiast         |          Debian, X and DRI developer