From mboxrd@z Thu Jan 1 00:00:00 1970 Message-ID: <4656C2D1.5000904@domain.hid> Date: Fri, 25 May 2007 13:04:49 +0200 From: Jan Kiszka MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enigE39EB9383AEA253E823EE412" Sender: jan.kiszka@domain.hid Subject: [Xenomai-core] [PATCH] small cleanups for rtcan_peak_dng List-Id: "Xenomai life and development \(bug reports, patches, discussions\)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Wolfgang Grandegger Cc: xenomai-core This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enigE39EB9383AEA253E823EE412 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable Hi Wolfgang, I came across the fact that xeno_can_peak_dng is autoloaded on 2.6 due to= its PnP announcement via MODULE_DEVICE_TABLE. xeno_irqbench and xeno_16550A used to behave similar, but both just as well as this driver require manual parameters anyway. So let's remove the table and thus any autoloading tendency. I also cleaned up a few driver messages at this chance. OK to apply? Jan --- ChangeLog | 5 +++++ ksrc/drivers/can/sja1000/rtcan_peak_dng.c | 9 ++++----- 2 files changed, 9 insertions(+), 5 deletions(-) Index: xenomai/ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- xenomai.orig/ChangeLog +++ xenomai/ChangeLog @@ -1,3 +1,8 @@ +2007-05-25 Jan Kiszka + + * ksrc/drivers/can/sja1000/rtcan_peak_dng.c: Remove PnP device + table to avoid autoloading. Fix driver error messages. + 2007-05-25 Philippe Gerum =20 * ksrc/nucleus/shadow.c (do_sigwake_event): Replace silent sanity Index: xenomai/ksrc/drivers/can/sja1000/rtcan_peak_dng.c =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- xenomai.orig/ksrc/drivers/can/sja1000/rtcan_peak_dng.c +++ xenomai/ksrc/drivers/can/sja1000/rtcan_peak_dng.c @@ -224,7 +224,7 @@ int __init rtcan_peak_dng_init_one(int i else if (strncmp(type[idx], "epp", 3) =3D=3D 0) dtype =3D DONGLE_TYPE_EPP; else { - printk("%s: type %s is invalid, use \"sp\" or \"sp\".", + printk("%s: type %s is invalid, use \"sp\" or \"epp\".", RTCAN_DRV_NAME, type[idx]); return -EINVAL; } @@ -329,8 +329,6 @@ static const struct pnp_device_id rtcan_ { } }; =20 -MODULE_DEVICE_TABLE(pnp, rtcan_peak_dng_pnp_tbl); - static int rtcan_peak_dng_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *id) { @@ -378,7 +376,7 @@ static int __init rtcan_peak_dng_init(vo i++) { =20 if ((ret =3D rtcan_peak_dng_init_one(i)) !=3D 0) { - printk("Init failed with %d\n", ret); + printk(KERN_ERR "%s: Init failed with %d\n", RTCAN_DRV_NAME, ret); goto cleanup; } done++; @@ -386,7 +384,8 @@ static int __init rtcan_peak_dng_init(vo if (done) return 0; =20 - printk("Please specify type=3Depp or type=3Dsp\n"); + printk(KERN_ERR "%s: Please specify type=3Depp or type=3Dsp\n", + RTCAN_DRV_NAME); =20 cleanup: rtcan_peak_dng_exit(); --------------enigE39EB9383AEA253E823EE412 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (MingW32) Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org iD8DBQFGVsLRniDOoMHTA+kRAgCXAJ4v/eVxWR9LRIJV0kHUF5QqNz0EsQCdH2s0 Bf6lWaIcis1StfDEXdkVCUY= =kaDS -----END PGP SIGNATURE----- --------------enigE39EB9383AEA253E823EE412--